diff options
| author | 2019-11-13 17:22:09 -0800 | |
|---|---|---|
| committer | 2019-11-13 17:22:09 -0800 | |
| commit | 99aac5451332a9adb795864a6861370ecc8b04a9 (patch) | |
| tree | 82b56158a0366f16a4c98da4cc20a5faa8141eb8 | |
| parent | 5b790b7612f06bea910d0ba4e3bb46cd2e99f7c2 (diff) | |
| parent | f1083db49e21bf71dabd321bb166aeedb978a605 (diff) | |
Merge "Replace framework-annotation-proc java lib with framework-all"
am: f1083db49e
Change-Id: I49fbeb2557c541d61b3034cbfdb6bf54cea2e677
| -rw-r--r-- | Android.bp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp index 891ee91f7ed9..272cb96d8891 100644 --- a/Android.bp +++ b/Android.bp @@ -456,14 +456,6 @@ 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", @@ -472,7 +464,7 @@ java_library { platform_compat_config { name: "framework-platform-compat-config", - src: ":framework-annotation-proc", + src: ":framework-all", } // A library including just UnsupportedAppUsage.java classes. @@ -1564,7 +1556,7 @@ aidl_mapping { genrule { name: "framework-annotation-proc-index", - srcs: [":framework-annotation-proc"], + srcs: [":framework-all"], cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)", out: ["unsupportedappusage_index.csv"], dist: { |