summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2021-05-26 13:57:11 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-05-26 13:57:11 +0000
commit766605521e19917ce305f29429dee99b0955e7dd (patch)
tree1e9f37524e8e6f887460a0dd06b91eca7e9b1955
parentb0f9a11a8ecdfc3397b3d0252ebf8e8b968e3cf2 (diff)
parent637b1d65e2dabe0cd99117b1bb2f6f36593352c7 (diff)
Merge "Revert "Inline usage of jarjar_rules.txt""
-rw-r--r--Android.bp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 6e7940c1fe84..6a1a8e1f6821 100644
--- a/Android.bp
+++ b/Android.bp
@@ -254,6 +254,11 @@ java_library {
installable: false,
}
+filegroup {
+ name: "framework-jarjar-rules",
+ srcs: ["framework-jarjar-rules.txt"],
+}
+
java_library {
name: "framework-minus-apex",
defaults: ["framework-aidl-export-defaults"],
@@ -270,7 +275,7 @@ java_library {
"--multi-dex",
],
installable: true,
- jarjar_rules: "framework-jarjar-rules.txt",
+ jarjar_rules: ":framework-jarjar-rules",
javac_shard_size: 150,
plugins: [
"view-inspector-annotation-processor",