summaryrefslogtreecommitdiff
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 5aa1e6a..d09a1e3 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -71,9 +71,6 @@ BOARD_USES_QCOM_HARDWARE := true
# ANT+
BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
-# APEX image
-DEXPREOPT_GENERATE_APEX_IMAGE := true
-
# Audio
BOARD_USES_ALSA_AUDIO := true
USE_CUSTOM_AUDIO_POLICY := 1
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 9315a40..a501b31 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -217,8 +217,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.runtime/javalib/core-oj.jar"</item>
<item>"/apex/com.android.runtime/javalib/core-libart.jar"</item>
<item>"/apex/com.android.media/javalib/updatable-media.jar"</item>
@@ -227,12 +225,10 @@
<item>"/system/lib64/libsurfaceflinger.so"</item>
</string-array>
- <!-- 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.runtime/javalib/core-oj.jar"</item>
<item>"/apex/com.android.runtime/javalib/core-libart.jar"</item>
<item>"/apex/com.android.media/javalib/updatable-media.jar"</item>