From 4bb7dcd892c363e425c7ceeea437d95cd72a3bb1 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Tue, 28 Dec 2021 21:18:00 +0000
Subject: [PATCH] rosemary: Adjust locations of oat files.

Bug: 158517130
Test: m
Change-Id: I2b65c9b4740eff4934fb0c1686a3d99d56310e8c
---
 overlay/frameworks/base/core/res/res/values/config.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 086866b..eb75bf2 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -395,15 +395,15 @@
       <item>/system/framework/arm/boot-core-libart.oat</item>
       <item>/system/framework/arm/boot-framework.oat</item>
       <item>/system/framework/arm/boot.oat</item>
-      <item>/system/framework/arm64/boot-core-libart.oat</item>
       <item>/system/framework/arm64/boot-framework.oat</item>
-      <item>/system/framework/arm64/boot.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.media/javalib/updatable-media.jar</item>
-      <item>/apex/com.android.runtime/javalib/core-libart.jar</item>
-      <item>/apex/com.android.runtime/javalib/core-oj.jar</item>
+      <item>/apex/com.android.art/javalib/arm64/boot.oat</item>
+      <item>/apex/com.android.art/javalib/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>/product/priv-app/SystemUI/SystemUI.apk</item>
       <item>/product/priv-app/SystemUI/oat/arm64/SystemUI.odex</item>
       <item>/system/lib64/libsurfaceflinger.so</item>