commit 7b8e3f6fdf9cbd6bef76ce8b7c8b729d240ae331
author Colin Cross <ccross@android.com> Mon May 16 21:46:53 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 16 21:46:53 2022 +0000
tree 4e071b6ff674488923f864ad0a30aa6ab9bda1dc
parent bc5e6a2ac2f9e3fa608177ed69b94719b3d462be
parent 47ce00d6ea11f0ff25bcf6658c4b18f76031959e

Merge "Merge commit 'upstream/auto-value-1.9^'"

android-annotation-stubs/Android.bp

diff --git a/android-annotation-stubs/Android.bp b/android-annotation-stubs/Android.bp
index 3e0be03..4276cc5 100644
--- a/android-annotation-stubs/Android.bp
+++ b/android-annotation-stubs/Android.bp
@@ -10,4 +10,5 @@
 java_library_host {
     name: "auto_android_annotation_stubs",
     srcs: ["src/**/*.java"],
+    visibility: ["//visibility:public"],
 }

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index 318c47b..b7327ea 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -15,14 +15,20 @@
     visibility: ["//visibility:public"],
 }
 
+java_library_host {
+    name: "libauto_service_plugin",
+    srcs: ["processor/src/main/java/**/*.java"],
+    visibility: ["//visibility:public"],
+    static_libs: [
+         "auto_common",
+         "auto_service_annotations",
+         "guava",
+    ],
+}
+
 java_plugin {
     name: "auto_service_plugin",
-    srcs: ["processor/src/main/java/**/*.java"],
-    static_libs: [
-        "auto_common",
-        "auto_service_annotations",
-        "guava",
-    ],
+    static_libs: ["libauto_service_plugin"],
     processor_class: "com.google.auto.service.processor.AutoServiceProcessor",
     visibility: ["//visibility:public"],
 }

value/Android.bp

diff --git a/value/Android.bp b/value/Android.bp
index 2f554aa..24e40a6 100644
--- a/value/Android.bp
+++ b/value/Android.bp
@@ -17,7 +17,7 @@
     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 @@
         "guava",
         "javapoet",
     ],
+    visibility: ["//visibility:public"],
 }
 
 java_library_host {
@@ -36,6 +37,7 @@
     libs: [
         "guava",
     ],
+    visibility: ["//visibility:public"],
 }
 
 
@@ -56,17 +58,7 @@
 
 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 @@
 
         "auto_android_annotation_stubs",
         "auto_common",
-        "auto_service_plugin",
+        "libauto_service_plugin",
         "auto_value_extension",
         "escapevelocity",
         "guava",
@@ -95,7 +87,7 @@
 
         "auto_android_annotation_stubs",
         "auto_common",
-        "auto_service_plugin",
+        "libauto_service_plugin",
         "auto_value_extension",
         "escapevelocity",
         "guava",