summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2021-05-25 11:43:36 +0000
committerAnton Hansson <hansson@google.com>2021-05-25 11:44:31 +0000
commitdffc59c12d30337367724a39e293d77c847c6d6d (patch)
tree6047b33980db43818b242acea844f1226b30d0f9
parent9c74c744fcf35107a6b00341ef7e4c98aca50de4 (diff)
Revert "Inline usage of jarjar_rules.txt"
This reverts commit 9c74c744fcf35107a6b00341ef7e4c98aca50de4 Reason for revert: b/186804505 Bug: 186804505 Test: presubmit Change-Id: I055f4075ac7728dfed5877286624a9600c90a38f
-rw-r--r--Android.bp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index ca014bc7b11c..f3888ab78b63 100644
--- a/Android.bp
+++ b/Android.bp
@@ -271,6 +271,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"],
@@ -291,7 +296,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",