diff options
| author | Sam Delmerico <delmerico@google.com> | 2022-05-13 18:30:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-13 18:30:07 +0000 |
| commit | 8e4ac201a107dd51bd676745ca463b4f8b2e9a5c (patch) | |
| tree | 51af0b4e403f19ebbbe7e1a3830e85d190dfecf4 | |
| parent | 02fc1d59868bdded8cd1605983d579b2bf75e3e0 (diff) | |
| parent | 78b1a3ed855c7423593339eedc774e19a5a7e10e (diff) | |
| download | auto-8e4ac201a107dd51bd676745ca463b4f8b2e9a5c.tar.gz | |
disable usage of plugins as static libs am: bc5e6a2ac2 am: 78b1a3ed85
Original change: https://android-review.googlesource.com/c/platform/external/auto/+/2051870
Change-Id: Ibfc8d4293966c8fc574fcb3155939f5946cb5b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 2f554aaa..24e40a63 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"], } @@ -56,17 +58,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"], } @@ -78,7 +70,7 @@ java_plugin { "auto_android_annotation_stubs", "auto_common", - "auto_service_plugin", + "libauto_service_plugin", "auto_value_extension", "escapevelocity", "guava", @@ -95,7 +87,7 @@ java_plugin { "auto_android_annotation_stubs", "auto_common", - "auto_service_plugin", + "libauto_service_plugin", "auto_value_extension", "escapevelocity", "guava", |