diff options
| -rw-r--r-- | java/java.go | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/java/java.go b/java/java.go index 37fc3907f..0479f1049 100644 --- a/java/java.go +++ b/java/java.go @@ -2675,17 +2675,10 @@ 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" || modType == "java_plugin" { - for _, d := range m.properties.Libs { - neverlinkLabel := android.BazelLabelForModuleDepSingle(ctx, d) - neverlinkLabel.Label = neverlinkLabel.Label + "-neverlink" - deps.Add(&neverlinkLabel) - } - - } else { - deps.Append(android.BazelLabelForModuleDeps(ctx, android.LastUniqueStrings(android.CopyOf(m.properties.Libs)))) + for _, d := range m.properties.Libs { + neverlinkLabel := android.BazelLabelForModuleDepSingle(ctx, d) + neverlinkLabel.Label = neverlinkLabel.Label + "-neverlink" + deps.Add(&neverlinkLabel) } } |