emulator: merge oc-emu-dev development project
BUG: 64401460
Change-Id: I9f757a14d9bb59db2e6c62f4a4c83a4373b7b4d6
diff --git a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
index 505a353..f09110f 100644
--- a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
+++ b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
@@ -42,6 +42,9 @@
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,
diff --git a/apps/WidgetPreview/AndroidManifest.xml b/apps/WidgetPreview/AndroidManifest.xml
index ea70e0c..0d058aa 100644
--- a/apps/WidgetPreview/AndroidManifest.xml
+++ b/apps/WidgetPreview/AndroidManifest.xml
@@ -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">
diff --git a/build/sdk-android-arm64-v8a.atree b/build/sdk-android-arm64-v8a.atree
index 5151680..e5e9f78 100644
--- a/build/sdk-android-arm64-v8a.atree
+++ b/build/sdk-android-arm64-v8a.atree
@@ -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
diff --git a/build/sdk-android-armeabi-v7a.atree b/build/sdk-android-armeabi-v7a.atree
index a693138..a59f323 100644
--- a/build/sdk-android-armeabi-v7a.atree
+++ b/build/sdk-android-armeabi-v7a.atree
@@ -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 @@
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
diff --git a/build/sdk-android-armeabi.atree b/build/sdk-android-armeabi.atree
index 26d5b04..1245892 100644
--- a/build/sdk-android-armeabi.atree
+++ b/build/sdk-android-armeabi.atree
@@ -21,4 +21,4 @@
${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
diff --git a/build/sdk.atree b/build/sdk.atree
index 76c6994..7c8b63c 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -236,6 +236,7 @@
# 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
diff --git a/sys-img/advancedFeatures.ini b/sys-img/advancedFeatures.ini
index 445312f..ad39ea4 100644
--- a/sys-img/advancedFeatures.ini
+++ b/sys-img/advancedFeatures.ini
@@ -1 +1,6 @@
GrallocSync = on
+LogcatPipe = on
+GLAsyncSwap = on
+GLESDynamicVersion = on
+GLDMA = on
+EncryptUserData = on
diff --git a/sys-img/advancedFeatures.ini.arm b/sys-img/advancedFeatures.ini.arm
new file mode 100644
index 0000000..9886f75
--- /dev/null
+++ b/sys-img/advancedFeatures.ini.arm
@@ -0,0 +1,5 @@
+GrallocSync = on
+LogcatPipe = on
+GLAsyncSwap = on
+GLESDynamicVersion = on
+GLDMA = on
diff --git a/tools/emulator/test-apps/SmokeTests/AndroidManifest.xml b/tools/emulator/test-apps/SmokeTests/AndroidManifest.xml
index 8843a00..6daafa9 100644
--- a/tools/emulator/test-apps/SmokeTests/AndroidManifest.xml
+++ b/tools/emulator/test-apps/SmokeTests/AndroidManifest.xml
@@ -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">
