Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev

2021-05-25 13:01:51 +00:00
parent 44061d90ec dffc59c12d
commit 23efb3ab75
1 changed files with 6 additions and 1 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -273,6 +273,11 @@ java_library {
    installable: false,
 }

+filegroup {
+    name: "framework-jarjar-rules",
+    srcs: ["framework-jarjar-rules.txt"],
+}
+
 java_defaults {
    name: "framework-minus-apex-defaults",
    defaults: ["framework-aidl-export-defaults"],
@@ -294,7 +299,7 @@ java_defaults {
        "--core-library",
        "--multi-dex",
    ],
-    jarjar_rules: "framework-jarjar-rules.txt",
+    jarjar_rules: ":framework-jarjar-rules",
    javac_shard_size: 150,
    plugins: [
        "view-inspector-annotation-processor",