summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2021-04-12 18:24:01 +0100
committerAnton Hansson <hansson@google.com>2021-04-12 18:38:55 +0100
commit1461c6ef55acc8d2c28fc767cf566d7437a4879c (patch)
tree0d9efac8d789393788eb33629b3be1748176605d
parent92b6c725b0022931ea0f3641b60f070ddcfb1413 (diff)
Inline usage of jarjar_rules.txt
No need to have a filegroup for this. This also has the nice side-effect of avoiding modules outside this directory depending on the file. Bug: 185128417 Test: m Merged-In: Idef6f2fd89116490c43427bba55202f46377a83d Change-Id: Idef6f2fd89116490c43427bba55202f46377a83d
-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",