Skip to content

Commit 9fd4870

Browse files
yahanzhou741g
authored andcommitted
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)
1 parent d48a67a commit 9fd4870

8 files changed

+22
-0
lines changed

build/sdk-android-arm64-v8a.atree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/
1919

2020
# version files for the SDK updater, from development.git
2121
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_arm64-v8a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
22+
23+
# feature control config file
24+
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

build/sdk-android-armeabi-v7a.atree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ ${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi-v7a_source.prop
2222

2323
# custom hardware.ini for 32 bit images
2424
development/sys-img/images_armeabi-v7a_hardware.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/hardware.ini
25+
26+
# feature control config file
27+
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

build/sdk-android-armeabi.atree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/
1818

1919
# version files for the SDK updater, from development.git
2020
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_armeabi_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
21+
22+
# feature control config file
23+
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

build/sdk-android-mips.atree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/
1919

2020
# version files for the SDK updater, from development.git
2121
development/sys-img-${TARGET_CPU_ABI}/images_mips_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
22+
23+
# feature control config file
24+
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

build/sdk-android-mips64.atree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/
1919

2020
# version files for the SDK updater, from development.git
2121
development/sys-img-${TARGET_CPU_ABI}/images_mips64_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
22+
23+
# feature control config file
24+
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

build/sdk-android-x86.atree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/ranchu/kernel-qemu system-images/${PLATFORM
1919

2020
# version files for the SDK updater, from development.git
2121
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_${TARGET_ARCH}_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
22+
23+
# feature control config file
24+
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

build/sdk-android-x86_64.atree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ prebuilts/qemu-kernel/${TARGET_ARCH}/ranchu/kernel-qemu system-images/${PLATFORM
1919

2020
# version files for the SDK updater, from development.git
2121
${HOST_OUT}/development/sys-img-${TARGET_CPU_ABI}/images_${TARGET_ARCH}_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
22+
23+
# feature control config file
24+
development/sys-img/advancedFeatures.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/advancedFeatures.ini

sys-img/advancedFeatures.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
GrallocSync = off

0 commit comments

Comments
 (0)