diff options
| author | 2019-11-13 22:04:21 -0800 | |
|---|---|---|
| committer | 2019-11-13 22:04:21 -0800 | |
| commit | f02d014ab2b4e55d5686ef67adff25f5eb8ebcd4 (patch) | |
| tree | 6a9027da2e8af555510e40526d050ba74ee7c217 | |
| parent | 2964b930c61f9aff309de58725565562e86cd9a9 (diff) | |
| parent | 06fa6a7e21482636f16e681e7ed031c0c9226455 (diff) | |
Merge "Revert "Replace framework-annotation-proc java lib with framework-all"" am: 546f68a66f
am: 06fa6a7e21
Change-Id: Ia369e201d6e33c305090f36ff89f54242af82ee9
| -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: { |