diff options
| -rw-r--r-- | Ravenwood.bp | 13 | ||||
| -rw-r--r-- | ravenwood/Android.bp | 6 | ||||
| -rw-r--r-- | ravenwood/bivalenttest/Android.bp | 3 | ||||
| -rw-r--r-- | ravenwood/texts/ravenwood-framework-jarjar-rules.txt | 2 |
4 files changed, 19 insertions, 5 deletions
diff --git a/Ravenwood.bp b/Ravenwood.bp index 159c17e13106..3c8e10edd5e7 100644 --- a/Ravenwood.bp +++ b/Ravenwood.bp @@ -225,12 +225,15 @@ java_library { // Jars in "ravenwood-runtime" are set to the classpath, sorted alphabetically. // Rename some of the dependencies to make sure they're included in the intended order. -java_genrule { +// Also apply jarjar. +java_library { name: "100-framework-minus-apex.ravenwood", - defaults: ["ravenwood-internal-only-visibility-genrule"], - cmd: "cp $(in) $(out)", - srcs: [":framework-minus-apex.ravenwood"], - out: ["100-framework-minus-apex.ravenwood.jar"], + defaults: ["ravenwood-internal-only-visibility-java"], + static_libs: [ + "framework-minus-apex.ravenwood", + ], + sdk_version: "core_platform", + jarjar_rules: ":ravenwood-framework-jarjar-rules", } java_genrule { diff --git a/ravenwood/Android.bp b/ravenwood/Android.bp index ad216b59c93d..4c8febf2aa2f 100644 --- a/ravenwood/Android.bp +++ b/ravenwood/Android.bp @@ -231,6 +231,12 @@ java_device_for_host { } filegroup { + name: "ravenwood-framework-jarjar-rules", + srcs: ["texts/ravenwood-framework-jarjar-rules.txt"], + visibility: ["//frameworks/base"], +} + +filegroup { name: "ravenwood-services-jarjar-rules", srcs: ["texts/ravenwood-services-jarjar-rules.txt"], visibility: ["//frameworks/base"], diff --git a/ravenwood/bivalenttest/Android.bp b/ravenwood/bivalenttest/Android.bp index 2d94894c54be..06cf08e6c3df 100644 --- a/ravenwood/bivalenttest/Android.bp +++ b/ravenwood/bivalenttest/Android.bp @@ -38,6 +38,9 @@ android_ravenwood_test { "androidx.annotation_annotation", "androidx.test.ext.junit", "androidx.test.rules", + + // To make sure it won't cause VerifyError (b/324063814) + "platformprotosnano", ], srcs: [ "test/**/*.java", diff --git a/ravenwood/texts/ravenwood-framework-jarjar-rules.txt b/ravenwood/texts/ravenwood-framework-jarjar-rules.txt new file mode 100644 index 000000000000..2eeb9042d732 --- /dev/null +++ b/ravenwood/texts/ravenwood-framework-jarjar-rules.txt @@ -0,0 +1,2 @@ +# To avoid VerifyError on nano proto files (b/324063814) +rule com.**.nano.** devicenano.@0 |