Merge "Revert "Inline usage of jarjar_rules.txt"" am: 766605521e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1717642 Change-Id: I46c2379af651e60d42bca0267a6de0234d16b3c9
2021-05-26 14:15:41 +00:00
parent efdf869be2 766605521e
commit 9e577929d6
1 changed files with 6 additions and 1 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -254,6 +254,11 @@ java_library {
    installable: false,
 }

+filegroup {
+    name: "framework-jarjar-rules",
+    srcs: ["framework-jarjar-rules.txt"],
+}
+
 java_library {
    name: "framework-minus-apex",
    defaults: ["framework-aidl-export-defaults"],
@@ -270,7 +275,7 @@ java_library {
        "--multi-dex",
    ],
    installable: true,
-    jarjar_rules: "framework-jarjar-rules.txt",
+    jarjar_rules: ":framework-jarjar-rules",
    javac_shard_size: 150,
    plugins: [
        "view-inspector-annotation-processor",