summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2021-03-29 13:53:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-29 13:53:42 +0000
commit37819c4014b84c042cd4243c5b455d059d837c3e (patch)
tree6369a0be1c53505f1e5467855f6245458d894e0a
parentc3eaa610ce401c693b5c9067000d45a313033df6 (diff)
parent8b5367dfba5f0d547f9701e14667efd2b3e6adf5 (diff)
downloadcoral-temp_ab_7272582.tar.gz
Merge "Remove odex/oat files from pinner list." am: fdeab52c8f am: 8b5367dfbatemp_ab_7272582
Original change: https://android-review.googlesource.com/c/device/google/coral/+/1645409 Change-Id: I046a5a172f0f186ae659568b3ca2a641d6e5f387
-rwxr-xr-xoverlay/frameworks/base/core/res/res/values/config.xml14
1 files changed, 0 insertions, 14 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 3fabd677..905edbfa 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -418,15 +418,12 @@
<!-- Default list of files pinned by the Pinner Service -->
<string-array translatable="false" name="config_defaultPinnerServiceFiles">
- <item>"/system/framework/arm64/boot-framework.oat"</item>
<item>"/system/framework/framework.jar"</item>
- <item>"/system/framework/oat/arm64/services.odex"</item>
<item>"/system/framework/services.jar"</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>
<item>"/system_ext/priv-app/SystemUIGoogle/SystemUIGoogle.apk"</item>
- <item>"/system_ext/priv-app/SystemUIGoogle/oat/arm64/SystemUIGoogle.odex"</item>
<item>"/system/lib64/libsurfaceflinger.so"</item>
</string-array>
@@ -436,17 +433,6 @@
<!-- Should the pinner service pin the Home application? -->
<bool name="config_pinnerHomeApp">true</bool>
- <!-- 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>"/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>
- <item>"/system_ext/priv-app/SystemUIGoogle/SystemUIGoogle.apk"</item>
- <item>"/system/lib64/libsurfaceflinger.so"</item>
- </string-array>
-
<!-- An array of device capabilities defined by GSMA SGP.22 v2.0, and their corresponding major
version. -->
<string-array translatable="false" name="config_telephonyEuiccDeviceCapabilities">