Merge "Adjust pinned files following runtime module work." am: 7db7283bf2

am: 1379ae0d3c

Change-Id: Ifa2e61f6fc25a720ca7e8ef9a56ec76544bb21c4
This commit is contained in:
Nicolas Geoffray
2019-02-20 12:21:08 -08:00
committed by android-build-merger

View File

@@ -317,13 +317,14 @@
<!-- 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/boot-framework.vdex"</item>
<item>"/system/framework/framework.jar"</item>
<item>"/system/framework/oat/arm64/services.odex"</item>
<item>"/system/framework/oat/arm64/services.vdex"</item>
<item>"/system/framework/services.jar"</item>
<item>"/system/framework/arm64/boot.oat"</item>
<item>"/system/framework/boot.vdex"</item>
<item>"/system/framework/arm64/boot-core-libart.oat"</item>
<item>"/system/framework/boot-core-libart.vdex"</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>
</string-array>
<!-- Should the pinner service pin the Camera application? -->