Merge "Inline usage of jarjar_rules.txt"

2021-04-14 09:45:00 +00:00
parent 246c14d6da 1461c6ef55
commit c6a0cddfab
1 changed files with 1 additions and 6 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -252,11 +252,6 @@ 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"],
@@ -273,7 +268,7 @@ java_library {
        "--multi-dex",
    ],
    installable: true,
-    jarjar_rules: ":framework-jarjar-rules",
+    jarjar_rules: "framework-jarjar-rules.txt",
    javac_shard_size: 150,
    plugins: [
        "view-inspector-annotation-processor",