Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev am: 23efb3ab75

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703098 Change-Id: I485fc49ea2f1f7b9f929bf019b81137a4356f196
2021-05-26 10:56:37 +00:00
parent 569657b92e 23efb3ab75
commit 8841b1e4a3
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",