commit 637b1d65e2dabe0cd99117b1bb2f6f36593352c7
author Anton Hansson <hansson@google.com> Tue May 25 16:56:48 2021 +0000
committer Anton Hansson <hansson@google.com> Tue May 25 16:56:48 2021 +0000
tree 197c03cc78328251005844dd1dbb86df4dd306ea
parent 1461c6ef55acc8d2c28fc767cf566d7437a4879c

Revert "Inline usage of jarjar_rules.txt"

This reverts commit 1461c6ef55acc8d2c28fc767cf566d7437a4879c.

Reason for revert: b/186804505
Bug: 186804505
Test: presubmit
Merged-In: I055f4075ac7728dfed5877286624a9600c90a38f
Change-Id: Ie1f100883c3ad6bb6f2f9a308647e4e5268b02d5

Android.bp

diff --git a/Android.bp b/Android.bp
index 084c9f5..1415b6a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -252,6 +252,11 @@
     installable: false,
 }
 
+filegroup {
+    name: "framework-jarjar-rules",
+    srcs: ["framework-jarjar-rules.txt"],
+}
+
 java_library {
     name: "framework-minus-apex",
     defaults: ["framework-aidl-export-defaults"],
@@ -268,7 +273,7 @@
         "--multi-dex",
     ],
     installable: true,
-    jarjar_rules: "framework-jarjar-rules.txt",
+    jarjar_rules: ":framework-jarjar-rules",
     javac_shard_size: 150,
     plugins: [
         "view-inspector-annotation-processor",