Fix resource-apk inclusion
- We used to include the "install" files, but we really should be using
"output" files instead.
- Also supports a new "inst_resource_apk" property, which is another APK
that's loaded as resources of the instrumentation app itself.
Flag: EXEMPT host test change only
Bug: 292141694
Test: m nothing --no-skip-soong-tests
Test: manual test with a local test module change and make sure
the second apk exists
Change-Id: Ibd3f9d4a1cbc0f805b2294605ae8bc06fdf53b75
diff --git a/java/ravenwood_test.go b/java/ravenwood_test.go
index 0a1b089..753a118 100644
--- a/java/ravenwood_test.go
+++ b/java/ravenwood_test.go
@@ -66,6 +66,10 @@
name: "app2",
sdk_version: "current",
}
+ android_app {
+ name: "app3",
+ sdk_version: "current",
+ }
prebuilt_font {
name: "Font.ttf",
src: "Font.ttf",
@@ -167,6 +171,7 @@
"ravenwood-runtime-jni2",
],
resource_apk: "app2",
+ inst_resource_apk: "app3",
sdk_version: "test_current",
}
`)
@@ -194,6 +199,7 @@
module.Output(installPathPrefix + "/ravenwood-test/lib64/libblue.so")
module.Output(installPathPrefix + "/ravenwood-test/lib64/libpink.so")
module.Output(installPathPrefix + "/ravenwood-test/ravenwood-res-apks/ravenwood-res.apk")
+ module.Output(installPathPrefix + "/ravenwood-test/ravenwood-res-apks/ravenwood-inst-res.apk")
// ravenwood-runtime*.so are included in the runtime, so it shouldn't be emitted.
for _, o := range module.AllOutputs() {