Merge "emulator: support dynamic partition"

am: 55923e295c Change-Id: I47e2e989dacd3c1bf390e0b27c6b347623e3c7a5
2019-05-06 08:35:16 -07:00
parent ca0c04488f 55923e295c
commit b7d78bb57b
3 changed files with 3 additions and 3 deletions
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -249,6 +249,7 @@ ramdisk.img                                system-images/${PLATFORM_NAME}/${TARG
 device/generic/goldfish/data/etc/userdata.img    system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/userdata.img
 data/misc                                        system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/data/misc
 system/build.prop                          system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/build.prop
+VerifiedBootParams.textproto   system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/VerifiedBootParams.textproto

 # Note: the kernel image is handled by sdk-android-<abi>.atree now.

--- a/sys-img/advancedFeatures.ini
+++ b/sys-img/advancedFeatures.ini
@@ -5,7 +5,6 @@ GLESDynamicVersion = on
 GLDMA = on
 EncryptUserData = on
 IntelPerformanceMonitoringUnit = on
-SystemAsRoot = on
 Wifi = on
-KernelDeviceTreeBlobSupport = on
 HostComposition = on
+DynamicPartition = on
--- a/sys-img/advancedFeatures.ini.arm
+++ b/sys-img/advancedFeatures.ini.arm
@@ -3,4 +3,4 @@ LogcatPipe = on
 GLAsyncSwap = on
 GLESDynamicVersion = on
 GLDMA = on
-SystemAsRoot = on
+DynamicPartition = on