aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BoardConfigCommon.mk3
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml8
2 files changed, 2 insertions, 9 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 596de09..94a3a8c 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -107,9 +107,6 @@ BOARD_VNDK_VERSION := current
# ANT+
BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
-# APEX
-DEXPREOPT_GENERATE_APEX_IMAGE := true
-
# Audio
USE_CUSTOM_AUDIO_POLICY := 1
USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index bbdd3d7..29375c1 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -323,8 +323,6 @@
<item>"/system/framework/framework.jar"</item>
<item>"/system/framework/oat/arm64/services.odex"</item>
<item>"/system/framework/services.jar"</item>
- <item>"/system/framework/arm64/boot.oat"</item>
- <item>"/system/framework/arm64/boot-core-libart.oat"</item>
<item>"/apex/com.android.art/javalib/core-oj.jar"</item>
<item>"/apex/com.android.art/javalib/core-libart.jar"</item>
<item>"/apex/com.android.media/javalib/updatable-media.jar"</item>
@@ -339,12 +337,10 @@
<!-- Should the pinner service pin the Home application? -->
<bool name="config_pinnerHomeApp">true</bool>
- <!-- List of files pinned by the Pinner Service with the apex boot image b/119800099 -->
- <string-array translatable="false" name="config_apexBootImagePinnerServiceFiles">
+ <!-- List of files pinned by the Pinner Service with the JIT Zygote boot image b/119800099 -->
+ <string-array translatable="false" name="config_jitzygoteBootImagePinnerServiceFiles">
<item>"/system/framework/framework.jar"</item>
<item>"/system/framework/services.jar"</item>
- <item>"/system/framework/arm64/apex.oat"</item>
- <item>"/system/framework/arm64/apex-core-libart.oat"</item>
<item>"/apex/com.android.art/javalib/core-oj.jar"</item>
<item>"/apex/com.android.art/javalib/core-libart.jar"</item>
<item>"/apex/com.android.media/javalib/updatable-media.jar"</item>