[Ravenwood] Support java_defaults for ravenwood properties
Test: m --no-skip-soong-tests nothing
Bug: 292141694
Flag: EXEMPT host test change only
Change-Id: Ide365dce9ff55ab07d304b10d660317c83f827fc
diff --git a/java/java.go b/java/java.go
index 4460053..85024e1 100644
--- a/java/java.go
+++ b/java/java.go
@@ -3277,6 +3277,7 @@
&JavaApiLibraryProperties{},
&bootclasspathFragmentProperties{},
&SourceOnlyBootclasspathProperties{},
+ &ravenwoodTestProperties{},
)
android.InitDefaultsModule(module)
diff --git a/java/ravenwood_test.go b/java/ravenwood_test.go
index 753a118..5d62ede 100644
--- a/java/ravenwood_test.go
+++ b/java/ravenwood_test.go
@@ -162,12 +162,16 @@
srcs: ["jni.cpp"],
stem: "libpink",
}
+ java_defaults {
+ name: "ravenwood-test-defaults",
+ jni_libs: ["jni-lib2"],
+ }
android_ravenwood_test {
name: "ravenwood-test",
srcs: ["Test.java"],
+ defaults: ["ravenwood-test-defaults"],
jni_libs: [
"jni-lib1",
- "jni-lib2",
"ravenwood-runtime-jni2",
],
resource_apk: "app2",