From 53fae383d660917444e3c3961e06a3dff6bc8a17 Mon Sep 17 00:00:00 2001 From: Alix Date: Tue, 8 Nov 2022 17:22:18 +0000 Subject: support libs for java_plugin -> * Test: bp2build tests Bug: 244210934 Change-Id: I7dbc820b23c4129485b0991aefb41e00e434d94e --- java/java.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'java/java.go') 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" -- cgit v1.2.3-59-g8ed1b