From 53fae383d660917444e3c3961e06a3dff6bc8a17 Mon Sep 17 00:00:00 2001
From: Alix <agespino@google.com>
Date: Tue, 8 Nov 2022 17:22:18 +0000
Subject: [PATCH] support libs for java_plugin -> *

Test: bp2build tests
Bug: 244210934
Change-Id: I7dbc820b23c4129485b0991aefb41e00e434d94e
---
 bp2build/java_plugin_conversion_test.go | 4 ++--
 java/java.go                            | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bp2build/java_plugin_conversion_test.go b/bp2build/java_plugin_conversion_test.go
index d9049d46b..8c6337b49 100644
--- a/bp2build/java_plugin_conversion_test.go
+++ b/bp2build/java_plugin_conversion_test.go
@@ -60,7 +60,7 @@ java_library {
         "//conditions:default": [],
     })`,
 				"deps": `[
-        ":java-lib-1",
+        ":java-lib-1-neverlink",
         ":java-lib-2",
     ]`,
 				"srcs": `[
@@ -101,7 +101,7 @@ java_library {
         "//conditions:default": [],
     })`,
 				"deps": `[
-        ":java-lib-1",
+        ":java-lib-1-neverlink",
         ":java-lib-2",
     ]`,
 			}),
diff --git a/java/java.go b/java/java.go
index 443ad9bb4..37fc3907f 100644
--- a/java/java.go
+++ b/java/java.go
@@ -2675,11 +2675,9 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
 	}
 
 	if m.properties.Libs != nil {
-
 		// TODO 244210934 ALIX Check if this else statement breaks presubmits get rid of it if it doesn't
-
 		modType := ctx.ModuleType()
-		if strings.HasPrefix(modType, "java_binary") || strings.HasPrefix(modType, "java_library") || modType == "android_app" || modType == "android_library" {
+		if strings.HasPrefix(modType, "java_binary") || strings.HasPrefix(modType, "java_library") || modType == "android_app" || modType == "android_library" || modType == "java_plugin" {
 			for _, d := range m.properties.Libs {
 				neverlinkLabel := android.BazelLabelForModuleDepSingle(ctx, d)
 				neverlinkLabel.Label = neverlinkLabel.Label + "-neverlink"