Support resource APKs
- android_ravenwood_test can now have `resource_apk: "ANDROID_APP_MODULE"`. This will copy the APK to the test directory as "ravenwood-res.apk". - android_ravenwood_libgroup can now have `data: ["MODULE"]`. We use this to add framework-res.apk (as `data:["framework-res"]`) to the ravenwood runtime path. Bug: 339614874 Test: m nothing --no-skip-soong-tests Test: ATEST="atest --no-bazel-mode" $ANDROID_BUILD_TOP/frameworks/base/ravenwood/run-ravenwood-tests.sh Do it on both aosp/main and goog/main Flag: EXEMPT: Host side change only Change-Id: I36516fec068a6359688a1dbedcb10a49c4631441
This commit is contained in:
@@ -57,6 +57,14 @@ var prepareRavenwoodRuntime = android.GroupFixturePreparers(
|
||||
name: "framework-rules.ravenwood",
|
||||
srcs: ["Rules.java"],
|
||||
}
|
||||
android_app {
|
||||
name: "app1",
|
||||
sdk_version: "current",
|
||||
}
|
||||
android_app {
|
||||
name: "app2",
|
||||
sdk_version: "current",
|
||||
}
|
||||
android_ravenwood_libgroup {
|
||||
name: "ravenwood-runtime",
|
||||
libs: [
|
||||
@@ -67,6 +75,9 @@ var prepareRavenwoodRuntime = android.GroupFixturePreparers(
|
||||
"ravenwood-runtime-jni1",
|
||||
"ravenwood-runtime-jni2",
|
||||
],
|
||||
data: [
|
||||
"app1",
|
||||
],
|
||||
}
|
||||
android_ravenwood_libgroup {
|
||||
name: "ravenwood-utils",
|
||||
@@ -102,6 +113,7 @@ func TestRavenwoodRuntime(t *testing.T) {
|
||||
runtime.Output(installPathPrefix + "/ravenwood-runtime/lib64/ravenwood-runtime-jni1.so")
|
||||
runtime.Output(installPathPrefix + "/ravenwood-runtime/lib64/libred.so")
|
||||
runtime.Output(installPathPrefix + "/ravenwood-runtime/lib64/ravenwood-runtime-jni3.so")
|
||||
runtime.Output(installPathPrefix + "/ravenwood-runtime/ravenwood-data/app1.apk")
|
||||
utils := ctx.ModuleForTests("ravenwood-utils", "android_common")
|
||||
utils.Output(installPathPrefix + "/ravenwood-utils/framework-rules.ravenwood.jar")
|
||||
}
|
||||
@@ -143,6 +155,7 @@ func TestRavenwoodTest(t *testing.T) {
|
||||
"jni-lib2",
|
||||
"ravenwood-runtime-jni2",
|
||||
],
|
||||
resource_apk: "app2",
|
||||
sdk_version: "test_current",
|
||||
}
|
||||
`)
|
||||
@@ -169,6 +182,7 @@ func TestRavenwoodTest(t *testing.T) {
|
||||
module.Output(installPathPrefix + "/ravenwood-test/lib64/jni-lib1.so")
|
||||
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")
|
||||
|
||||
// ravenwood-runtime*.so are included in the runtime, so it shouldn't be emitted.
|
||||
for _, o := range module.AllOutputs() {
|
||||
|
Reference in New Issue
Block a user