Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev am: 23efb3ab75 am: eff53d0075 am: 43d664ae9a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703098

Change-Id: Ifdc957f92bd26ca3951ca2b24276936188de242c
This commit is contained in:
Anton Hansson
2021-05-25 13:27:32 +00:00
committed by Automerger Merge Worker

View File

@@ -273,6 +273,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"],
@@ -294,7 +299,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",