Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev am: 23efb3ab75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703098 Change-Id: I4ed13d11d8821644220efce3cb369c453df93188
This commit is contained in:
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user