diff options
| author | Sam Delmerico <delmerico@google.com> | 2022-03-31 17:55:53 +0000 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2022-09-09 21:44:28 +0000 |
| commit | 2fbfb797de85c030eb30eb9e256474567010f6f5 (patch) | |
| tree | 519c573711392c7646801e8f1f5c2736362f3293 | |
| parent | 40d3b85d3fc909fd43ab84a250e58129e8e71f56 (diff) | |
| download | auto-2fbfb797de85c030eb30eb9e256474567010f6f5.tar.gz | |
disable usage of plugins as static libs
Test: m auto_service_plugin
Bug: 225388628
Change-Id: I36939cffd03ddc221b87652dcd1210f1da2b6a0b
(cherry picked from commit bc5e6a2ac2f9e3fa608177ed69b94719b3d462be)
Merged-In: I36939cffd03ddc221b87652dcd1210f1da2b6a0b
| -rw-r--r-- | android-annotation-stubs/Android.bp | 1 | ||||
| -rw-r--r-- | service/Android.bp | 16 | ||||
| -rw-r--r-- | value/Android.bp | 20 |
3 files changed, 18 insertions, 19 deletions
diff --git a/android-annotation-stubs/Android.bp b/android-annotation-stubs/Android.bp index 3e0be03d..4276cc5e 100644 --- a/android-annotation-stubs/Android.bp +++ b/android-annotation-stubs/Android.bp @@ -10,4 +10,5 @@ package { java_library_host { name: "auto_android_annotation_stubs", srcs: ["src/**/*.java"], + visibility: ["//visibility:public"], } diff --git a/service/Android.bp b/service/Android.bp index 318c47b9..b7327ea7 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -15,14 +15,20 @@ java_library { visibility: ["//visibility:public"], } -java_plugin { - name: "auto_service_plugin", +java_library_host { + name: "libauto_service_plugin", srcs: ["processor/src/main/java/**/*.java"], + visibility: ["//visibility:public"], static_libs: [ - "auto_common", - "auto_service_annotations", - "guava", + "auto_common", + "auto_service_annotations", + "guava", ], +} + +java_plugin { + name: "auto_service_plugin", + static_libs: ["libauto_service_plugin"], processor_class: "com.google.auto.service.processor.AutoServiceProcessor", visibility: ["//visibility:public"], } diff --git a/value/Android.bp b/value/Android.bp index b4057353..8dd7f26a 100644 --- a/value/Android.bp +++ b/value/Android.bp @@ -17,7 +17,7 @@ java_library_host { name: "libauto_value_plugin", srcs: ["src/main/java/com/google/auto/value/processor/**/*.java"], java_resources: [":auto_value_plugin_resources"], - libs: [ + static_libs: [ "auto_android_annotation_stubs", "auto_service_annotations", "error_prone_annotations", @@ -28,6 +28,7 @@ java_library_host { "guava", "javapoet", ], + visibility: ["//visibility:public"], } java_library_host { @@ -36,6 +37,7 @@ java_library_host { libs: [ "guava", ], + visibility: ["//visibility:public"], } @@ -57,17 +59,7 @@ java_library { java_plugin { name: "auto_value_plugin", - static_libs: [ - "libauto_value_plugin", - - "auto_android_annotation_stubs", - "auto_common", - "auto_service_plugin", - "auto_value_extension", - "escapevelocity", - "guava", - "javapoet", - ], + static_libs: ["libauto_value_plugin"], processor_class: "com.google.auto.value.processor.AutoValueProcessor", visibility: ["//visibility:public"], } @@ -79,7 +71,7 @@ java_plugin { "auto_android_annotation_stubs", "auto_common", - "auto_service_plugin", + "libauto_service_plugin", "auto_value_extension", "escapevelocity", "guava", @@ -96,7 +88,7 @@ java_plugin { "auto_android_annotation_stubs", "auto_common", - "auto_service_plugin", + "libauto_service_plugin", "auto_value_extension", "escapevelocity", "guava", |