commit d619e4327c0c5713b5d8b0ca3259f4b9bbbebd05
author Makoto Onuki <omakoto@google.com> Fri Jul 19 16:45:02 2024 -0700
committer John Wu <topjohnwu@google.com> Thu Aug 01 18:10:08 2024 +0000
tree 9a92fa619f9801d584e1566a28700ced2c9fc016
parent f01b502933344c8bdf84c25c22fef259323332f9

[Ravenwood] Add framework-res.apk to ravenwood-runtime

Also add a test for android_ravenwood_test.resource_apk.

Bug: 339614874
Test: atest RavenwoodResApkTest
Flag: EXEMPT: Host side change only

Change-Id: I66558323f5313546876254f1635fa5260e1790e4
(cherry picked from commit e49a7722b8a3b44959da4c86325fdd4b3fe4fb80)

ravenwood/Android.bp

diff --git a/ravenwood/Android.bp b/ravenwood/Android.bp
index cc8ccc3..7c8fd42 100644
--- a/ravenwood/Android.bp
+++ b/ravenwood/Android.bp
@@ -68,7 +68,10 @@
     srcs: [
         "runtime-common-ravenwood-src/**/*.java",
     ],
-    visibility: ["//frameworks/base"],
+    visibility: [
+        // Some tests need to access the utilities.
+        ":__subpackages__",
+    ],
 }
 
 java_library {
@@ -318,6 +321,9 @@
 
 android_ravenwood_libgroup {
     name: "ravenwood-runtime",
+    data: [
+        "framework-res",
+    ],
     libs: [
         "100-framework-minus-apex.ravenwood",
         "200-kxml2-android",