diff options
| author | 2019-01-23 12:37:11 -0800 | |
|---|---|---|
| committer | 2019-01-23 12:37:11 -0800 | |
| commit | f30fba0a604ca8cbc717491d81577d9627e2f537 (patch) | |
| tree | 3864a837099cf783df3b161f4de33ae2fb98b296 | |
| parent | 977fc9bf8ed5cd0b3f81bd25525c7c9f6303516d (diff) | |
| parent | bc40469e19fbca8a1bc7a70514cc84aa7e9717a4 (diff) | |
Merge "Replace annotation_processors with plugins"
am: bc40469e19
Change-Id: I0f91aa05eca9635ce0bc59e40714adff908af682
| -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 38d3196327d5..45b6511fecdf 100644 --- a/Android.bp +++ b/Android.bp @@ -747,11 +747,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/**/*", ], |