commit e49a7722b8a3b44959da4c86325fdd4b3fe4fb80
author Makoto Onuki <omakoto@google.com> Fri Jul 19 16:45:02 2024 -0700
committer Makoto Onuki <omakoto@google.com> Thu Jul 25 16:45:07 2024 -0700
tree 2cb99334df3072509114810aa816eaba1b2b3b21
parent 2d2a451503fae0714580dba4368c31c186a52062

[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

ravenwood/Android.bp

diff --git a/ravenwood/Android.bp b/ravenwood/Android.bp
index 8d89cc1..71a4297 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",