From bc5e6a2ac2f9e3fa608177ed69b94719b3d462be Mon Sep 17 00:00:00 2001
From: Sam Delmerico <delmerico@google.com>
Date: Thu, 31 Mar 2022 17:55:53 +0000
Subject: disable usage of plugins as static libs

Test: m auto_service_plugin
Bug: 225388628
Change-Id: I36939cffd03ddc221b87652dcd1210f1da2b6a0b
---
 android-annotation-stubs/Android.bp |  1 +
 service/Android.bp                  | 16 +++++++++++-----
 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",
-- 
cgit v1.2.3