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
Change-Id: Idef6f2fd89116490c43427bba55202f46377a83d
This commit is contained in:
Anton Hansson
2021-04-12 18:24:01 +01:00
parent e3d44e8b76
commit 9c74c744fc

View File

@@ -271,11 +271,6 @@ 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"],
@@ -296,7 +291,7 @@ java_defaults {
"--core-library",
"--multi-dex",
],
jarjar_rules: ":framework-jarjar-rules",
jarjar_rules: "framework-jarjar-rules.txt",
javac_shard_size: 150,
plugins: [
"view-inspector-annotation-processor",