diff options
| author | 2019-11-14 05:43:38 +0000 | |
|---|---|---|
| committer | 2019-11-14 05:43:38 +0000 | |
| commit | 546f68a66fcbf2de9a3a816b6b15f612453a801e (patch) | |
| tree | 8807e9488635ab8c8a830fa0c72d237a3e4ba9c7 | |
| parent | 6e5fd21a65e1dad52ebb1141b6dac9ae6baee996 (diff) | |
| parent | f0fdd6889d3e285a1d1e38ed8b2d21a11b572436 (diff) | |
Merge "Revert "Replace framework-annotation-proc java lib with framework-all""
| -rw-r--r-- | Android.bp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 272cb96d8891..891ee91f7ed9 100644 --- a/Android.bp +++ b/Android.bp @@ -456,6 +456,14 @@ java_library { srcs: [":framework-all-sources"], installable: false, libs: ["app-compat-annotations"], +} + +java_library { + name: "framework-annotation-proc", + defaults: ["framework-defaults"], + srcs: [":framework-all-sources"], + libs: ["app-compat-annotations"], + installable: false, plugins: [ "unsupportedappusage-annotation-processor", "compat-changeid-annotation-processor", @@ -464,7 +472,7 @@ java_library { platform_compat_config { name: "framework-platform-compat-config", - src: ":framework-all", + src: ":framework-annotation-proc", } // A library including just UnsupportedAppUsage.java classes. @@ -1556,7 +1564,7 @@ aidl_mapping { genrule { name: "framework-annotation-proc-index", - srcs: [":framework-all"], + srcs: [":framework-annotation-proc"], cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)", out: ["unsupportedappusage_index.csv"], dist: { |