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

Merge "Revert "Replace framework-annotation-proc java lib with framework-all""

Browse Source 
am: 546f68a66f

Change-Id: Ie28ad6fd9943846fdd74236a43c65adafc4028fa
This commit is contained in:
Jiyong Park
2019-11-13 21:55:10 -08:00
committed by android-build-merger
parent 5fd6bb9610 546f68a66f
commit 06fa6a7e21
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Android.bp
View File

@@ -456,6 +456,14 @@ java_library {
srcs: [":framework-all-sources"], srcs: [":framework-all-sources"],
installable: false, installable: false,
libs: ["app-compat-annotations"], libs: ["app-compat-annotations"],
}
java_library {
name: "framework-annotation-proc",
defaults: ["framework-defaults"],
srcs: [":framework-all-sources"],
libs: ["app-compat-annotations"],
installable: false,
plugins: [ plugins: [
"unsupportedappusage-annotation-processor", "unsupportedappusage-annotation-processor",
"compat-changeid-annotation-processor", "compat-changeid-annotation-processor",
@@ -464,7 +472,7 @@ java_library {
platform_compat_config { platform_compat_config {
name: "framework-platform-compat-config", name: "framework-platform-compat-config",
src: ":framework-all", src: ":framework-annotation-proc",
} }
// A library including just UnsupportedAppUsage.java classes. // A library including just UnsupportedAppUsage.java classes.
@@ -1556,7 +1564,7 @@ aidl_mapping {
genrule { genrule {
name: "framework-annotation-proc-index", name: "framework-annotation-proc-index",
srcs: [":framework-all"], srcs: [":framework-annotation-proc"],
cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)", cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)",
out: ["unsupportedappusage_index.csv"], out: ["unsupportedappusage_index.csv"],
dist: { dist: {