commit 23efb3ab75ae1a5e55197e0fa93140a83d35a1ad
author Anton Hansson <hansson@google.com> Tue May 25 13:01:51 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 25 13:01:51 2021 +0000
tree 1015cd55d0ffb527a656db92daf4d3bfcc739973
parent 44061d90ecb881d1be960b77ab7aa47ca0fbf048
parent dffc59c12d30337367724a39e293d77c847c6d6d

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 9023a19..4d8924d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -273,6 +273,11 @@
     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 @@
         "--core-library",
         "--multi-dex",
     ],
-    jarjar_rules: "framework-jarjar-rules.txt",
+    jarjar_rules: ":framework-jarjar-rules",
     javac_shard_size: 150,
     plugins: [
         "view-inspector-annotation-processor",