diff options
| author | Colin Cross <ccross@android.com> | 2019-01-23 13:03:29 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-23 13:03:29 -0800 |
| commit | 5d4bd49013bcb8047a929e8abd64d6a6694922bd (patch) | |
| tree | 47201e440e36946a2550145796ad9075cebe87c1 | |
| parent | 5f80ac0c9b5d5e734ee739d4ebff688f8d372191 (diff) | |
| parent | 4262bd19add797aebef4a6c0daa20338cee6608c (diff) | |
Merge "Replace annotation_processors with plugins" am: bc40469e19 am: f30fba0a60
am: 4262bd19ad
Change-Id: I0b417cccddebdccc8613d82d93ff9f0658be8217
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | tools/processors/unsupportedappusage/Android.bp | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp index 1d93ee7fe9e0..ab7d709d86ea 100644 --- a/Android.bp +++ b/Android.bp @@ -808,11 +808,7 @@ java_library { name: "framework-annotation-proc", defaults: ["framework-defaults"], // Use UsedByApps annotation processor - annotation_processors: ["unsupportedappusage-annotation-processor"], - // b/25860419: annotation processors must be explicitly specified for grok - annotation_processor_classes: [ - "android.processor.unsupportedappusage.UsedByAppsProcessor", - ], + plugins: ["unsupportedappusage-annotation-processor"], } // A host library including just UnsupportedAppUsage.java so that the annotation diff --git a/tools/processors/unsupportedappusage/Android.bp b/tools/processors/unsupportedappusage/Android.bp index 1aca3edfab88..0e33fddcde07 100644 --- a/tools/processors/unsupportedappusage/Android.bp +++ b/tools/processors/unsupportedappusage/Android.bp @@ -1,6 +1,8 @@ -java_library_host { +java_plugin { name: "unsupportedappusage-annotation-processor", + processor_class: "android.processor.unsupportedappusage.UnsupportedAppUsageProcessor", + java_resources: [ "META-INF/**/*", ], |