summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2021-04-14 09:45:00 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-04-14 09:45:00 +0000
commitc6a0cddfabec068a3cee99710f7d3bd1718d4a2f (patch)
treed67ea0713996d00c8e4ae75f3cfd6f3a6437638a
parent246c14d6daac279c7f24b08fe2917cb7c1f247c6 (diff)
parent1461c6ef55acc8d2c28fc767cf566d7437a4879c (diff)
Merge "Inline usage of jarjar_rules.txt"
-rw-r--r--Android.bp7
1 files changed, 1 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index 1415b6a78136..084c9f51d12e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -252,11 +252,6 @@ 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"],
@@ -273,7 +268,7 @@ java_library {
"--multi-dex",
],
installable: true,
- jarjar_rules: ":framework-jarjar-rules",
+ jarjar_rules: "framework-jarjar-rules.txt",
javac_shard_size: 150,
plugins: [
"view-inspector-annotation-processor",