From 6bceabf81d9b939b9afb5bfc4e95144ce97f18e2 Mon Sep 17 00:00:00 2001
From: bohu <bohu@google.com>
Date: Wed, 13 Mar 2019 13:29:09 -0700
Subject: [PATCH] emulator: support dynamic partition

BUG: 125540538

Change-Id: I68895c39c4f48f53077a4e766718c63b1d1da91a
Merged-In: I68895c39c4f48f53077a4e766718c63b1d1da91a
---
 build/sdk.atree                  | 1 +
 sys-img/advancedFeatures.ini     | 3 +--
 sys-img/advancedFeatures.ini.arm | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/sdk.atree b/build/sdk.atree
index 87ad0b53b..e637e8f1b 100644
--- 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.
 
diff --git a/sys-img/advancedFeatures.ini b/sys-img/advancedFeatures.ini
index 70dec80ec..e1f8b6ade 100644
--- 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
diff --git a/sys-img/advancedFeatures.ini.arm b/sys-img/advancedFeatures.ini.arm
index 29c1cf72e..0acc6d557 100644
--- 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