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

Merge "Replace framework-annotation-proc java lib with framework-all" am: f1083db49e

Browse Source 
am: 99aac54513

Change-Id: I1cd00bfcea2e113a16c6b032eb457758599123fc
This commit is contained in:
Jiyong Park
2019-11-13 17:29:02 -08:00
committed by android-build-merger
parent 01d77cef37 99aac54513
commit ba366fd805
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Android.bp
View File

@@ -456,14 +456,6 @@ 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",
@@ -472,7 +464,7 @@ java_library {
platform_compat_config { platform_compat_config {
name: "framework-platform-compat-config", name: "framework-platform-compat-config",
src: ":framework-annotation-proc", src: ":framework-all",
} }
// A library including just UnsupportedAppUsage.java classes. // A library including just UnsupportedAppUsage.java classes.
@@ -1564,7 +1556,7 @@ aidl_mapping {
genrule { genrule {
name: "framework-annotation-proc-index", name: "framework-annotation-proc-index",
srcs: [":framework-annotation-proc"], srcs: [":framework-all"],
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: {