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 {