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

Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab am: 774da343c6

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

Change-Id: Ib95e1f34d7fa382d05c6e191ddb021b5bf5dad3c
This commit is contained in:
Anton Hansson
2021-04-14 10:51:40 +00:00
committed by Automerger Merge Worker
parent f3bde71026 774da343c6
commit ad986df778
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Android.bp
View File

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