diff options
| author | bohu <bohu@google.com> | 2019-03-13 13:29:09 -0700 |
|---|---|---|
| committer | Bo Hu <bohu@google.com> | 2019-05-03 03:37:21 +0000 |
| commit | edb348c7c282166bbef37fba5b0a8ef4b6322a8b (patch) | |
| tree | 32f241353dffd8326e75d2b1d1b19748ae43493b | |
| parent | 945100c575b9cb37b750886b43ee829d837f346c (diff) | |
| download | development-edb348c7c282166bbef37fba5b0a8ef4b6322a8b.tar.gz | |
emulator: disable system-on-root and kernelBlob support
BUG: 125540538
Change-Id: I68895c39c4f48f53077a4e766718c63b1d1da91a
Merged-In: I68895c39c4f48f53077a4e766718c63b1d1da91a
| -rw-r--r-- | build/sdk.atree | 1 | ||||
| -rw-r--r-- | sys-img/advancedFeatures.ini | 3 | ||||
| -rw-r--r-- | 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 |