Feature control config file in system image

This CL adds feature control config file to the system image bundle.

It works with this emulator CL:

https://android-review.googlesource.com/#/c/233279/

Change-Id: I1e0f73f0dc36853d99c2408679aa6706b6489a58
(cherry picked from commit 280091d47054677b358216c8fa0cac106d42a520)

8 files changed, 22 insertions, 0 deletions

diff --git a/build/sdk-android-arm64-v8a.atree b/build/sdk-android-arm64-v8a.atree
index 82c18d03b..5151680be 100644
--- a/build/sdk-android-arm64-v8a.atree
+++ b/build/sdk-android-arm64-v8a.atree
@@ -19,3 +19,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/
 
 # 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
diff --git a/build/sdk-android-armeabi-v7a.atree b/build/sdk-android-armeabi-v7a.atree
index 24ea06a35..8571a0876 100644
--- a/build/sdk-android-armeabi-v7a.atree
+++ b/build/sdk-android-armeabi-v7a.atree
@@ -22,3 +22,6 @@ ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi-v7a_source.prop
 
 # custom hardware.ini for 32 bit images
 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
diff --git a/build/sdk-android-armeabi.atree b/build/sdk-android-armeabi.atree
index af0d02950..79430746f 100644
--- a/build/sdk-android-armeabi.atree
+++ b/build/sdk-android-armeabi.atree
@@ -18,3 +18,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/
 
 # version files for the SDK updater, from development.git
 ${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
diff --git a/build/sdk-android-mips.atree b/build/sdk-android-mips.atree
index 7ec630979..a07bc038e 100644
--- a/build/sdk-android-mips.atree
+++ b/build/sdk-android-mips.atree
@@ -19,3 +19,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/
 
 # version files for the SDK updater, from development.git
 development/sys-img-${TARGET_CPU_ABI}/images_mips_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
diff --git a/build/sdk-android-mips64.atree b/build/sdk-android-mips64.atree
index b356b283a..b89ab5607 100644
--- a/build/sdk-android-mips64.atree
+++ b/build/sdk-android-mips64.atree
@@ -19,3 +19,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/
 
 # version files for the SDK updater, from development.git
 development/sys-img-${TARGET_CPU_ABI}/images_mips64_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
diff --git a/build/sdk-android-x86.atree b/build/sdk-android-x86.atree
index 10ce3e36f..46d05f52d 100644
--- a/build/sdk-android-x86.atree
+++ b/build/sdk-android-x86.atree
@@ -19,3 +19,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/ranchu/kernel-qemu system-images/${PLATFORM
 
 # version files for the SDK updater, from development.git
 ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_${TARGET_ARCH}_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
diff --git a/build/sdk-android-x86_64.atree b/build/sdk-android-x86_64.atree
index 652482357..b9867d867 100644
--- a/build/sdk-android-x86_64.atree
+++ b/build/sdk-android-x86_64.atree
@@ -19,3 +19,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/ranchu/kernel-qemu system-images/${PLATFORM
 
 # version files for the SDK updater, from development.git
 ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_${TARGET_ARCH}_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
diff --git a/sys-img/advancedFeatures.ini b/sys-img/advancedFeatures.ini
new file mode 100644
index 000000000..78548fbe0
--- /dev/null
+++ b/sys-img/advancedFeatures.ini
@@ -0,0 +1 @@
+GrallocSync = off