LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "emulator: merge oc-emu-dev development project" into oc-mr1-dev

Browse Source 
am: 6a962e362f

Change-Id: I65066904476b847ca9fc8c6ffa2336c4616fcbf9
This commit is contained in:
Bo Hu
2017-08-14 18:49:47 +00:00
committed by android-build-merger
parent 0d207f6c8d 6a962e362f
commit 969f5ae3cd
9 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
View File

@@ -42,6 +42,9 @@ public class DefaultActivity extends Activity {
Settings.Secure.putInt(getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 1);
// Disables a dialog shown on adb install execution.
Settings.Global.putInt(getContentResolver(), Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 0);
// Enable the GPS.
// Not needed since this SDK will contain the Settings app.
Settings.Secure.putString(getContentResolver(), Settings.Secure.LOCATION_PROVIDERS_ALLOWED,

2
apps/WidgetPreview/AndroidManifest.xml
View File

@@ -20,7 +20,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.BIND_APPWIDGET" />
<uses-sdk android:targetSdkVersion="11"/>
<uses-sdk android:targetSdkVersion="24"/>
<application android:label="@string/application_label">

5
build/sdk-android-arm64-v8a.atree
View File

@@ -14,11 +14,10 @@
# limitations under the License.
#
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
prebuilts/qemu-kernel/${TARGET_ARCH}/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
# version files for the SDK updater, from development.git
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_arm64-v8a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
# feature control config file
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini
development/sys-img/advancedFeatures.ini.arm system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

5
build/sdk-android-armeabi-v7a.atree
View File

@@ -15,8 +15,7 @@
#
# Copy the ARMv7 specific kernel image to .../kernel-qemu
prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu-armv7 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
prebuilts/qemu-kernel/${TARGET_ARCH}/ranchu/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
prebuilts/qemu-kernel/${TARGET_ARCH}/3.18/kernel-qemu2 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-ranchu
# version files for the SDK updater, from development.git
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi-v7a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
@@ -25,4 +24,4 @@ ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi-v7a_source.prop
development/sys-img/images_armeabi-v7a_hardware.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/hardware.ini
# feature control config file
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini
development/sys-img/advancedFeatures.ini.arm system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

2
build/sdk-android-armeabi.atree
View File

@@ -21,4 +21,4 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/ranchu/kernel-qemu system-images/${PLATFORM
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
# feature control config file
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini
development/sys-img/advancedFeatures.ini.arm system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

1
build/sdk.atree
View File

@@ -236,6 +236,7 @@ development/sdk/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/skins/NOTIC
# System images + Kernel
system-qemu.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/system.img
vendor-qemu.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/vendor.img
ramdisk.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/ramdisk.img
userdata.img system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/userdata.img
system/build.prop system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/build.prop

5
sys-img/advancedFeatures.ini
View File

@@ -1 +1,6 @@
GrallocSync = on
LogcatPipe = on
GLAsyncSwap = on
GLESDynamicVersion = on
GLDMA = on
EncryptUserData = on

5
sys-img/advancedFeatures.ini.arm Normal file
View File

@@ -0,0 +1,5 @@
GrallocSync = on
LogcatPipe = on
GLAsyncSwap = on
GLESDynamicVersion = on
GLDMA = on

3
tools/emulator/test-apps/SmokeTests/AndroidManifest.xml
View File

@@ -19,7 +19,8 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_SMS" />
<uses-sdk android:minSdkVersion="4" />
<uses-sdk android:minSdkVersion="4"
android:targetSdkVersion="24"/>
<instrumentation android:targetPackage="com.android.emulator.smoketests"
android:name="android.support.test.runner.AndroidJUnitRunner" />
<application android:label="Emulator Smoke Tests">