Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5d0d5cf801a98138f6ef0f5fbfd2de986e935f7e
This commit is contained in:
Anton Hansson
2021-05-25 13:20:17 +00:00
committed by Automerger Merge Worker
parent 4833e2240c eff53d0075
commit 43d664ae9a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Android.bp
View File

@@ -273,6 +273,11 @@ java_library {
installable: false, installable: false,
} }
filegroup {
name: "framework-jarjar-rules",
srcs: ["framework-jarjar-rules.txt"],
}
java_defaults { java_defaults {
name: "framework-minus-apex-defaults", name: "framework-minus-apex-defaults",
defaults: ["framework-aidl-export-defaults"], defaults: ["framework-aidl-export-defaults"],
@@ -294,7 +299,7 @@ java_defaults {
"--core-library", "--core-library",
"--multi-dex", "--multi-dex",
], ],
jarjar_rules: "framework-jarjar-rules.txt", jarjar_rules: ":framework-jarjar-rules",
javac_shard_size: 150, javac_shard_size: 150,
plugins: [ plugins: [
"view-inspector-annotation-processor", "view-inspector-annotation-processor",