Rename nano prot classes to avoid conflict
Bug: 324063814
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Merged-in: Icab04d2b290a8ea568887dcd837bdedecf64ab0d
Change-Id: Icab04d2b290a8ea568887dcd837bdedecf64ab0d
diff --git a/Ravenwood.bp b/Ravenwood.bp
index 159c17e..3c8e10e 100644
--- a/Ravenwood.bp
+++ b/Ravenwood.bp
@@ -225,12 +225,15 @@
// 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 ad216b5..4c8febf 100644
--- a/ravenwood/Android.bp
+++ b/ravenwood/Android.bp
@@ -231,6 +231,12 @@
}
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 2d94894..06cf08e6 100644
--- a/ravenwood/bivalenttest/Android.bp
+++ b/ravenwood/bivalenttest/Android.bp
@@ -38,6 +38,9 @@
"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 0000000..2eeb904
--- /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