commit c6a0cddfabec068a3cee99710f7d3bd1718d4a2f
author Anton Hansson <hansson@google.com> Wed Apr 14 09:45:00 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 14 09:45:00 2021 +0000
tree d67ea0713996d00c8e4ae75f3cfd6f3a6437638a
parent 246c14d6daac279c7f24b08fe2917cb7c1f247c6
parent 1461c6ef55acc8d2c28fc767cf566d7437a4879c

Merge "Inline usage of jarjar_rules.txt"

Android.bp

diff --git a/Android.bp b/Android.bp
index 1415b6a..084c9f5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -252,11 +252,6 @@
     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 @@
         "--multi-dex",
     ],
     installable: true,
-    jarjar_rules: ":framework-jarjar-rules",
+    jarjar_rules: "framework-jarjar-rules.txt",
     javac_shard_size: 150,
     plugins: [
         "view-inspector-annotation-processor",