diff options
| author | Alix Espino <agespino@google.com> | 2023-01-19 20:38:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-19 20:38:07 +0000 |
| commit | 733b1b78fa969ca04e2b826808cd0b3fb79a8287 (patch) | |
| tree | a04fccd92a59a63c5c4948b6fbd138d47f69cc24 /java/java.go | |
| parent | 3a79caa3b915889f84b79e0edf728a035faf30a8 (diff) | |
| parent | 684f63ab5ab0dc7680c901b9a761a21f36df9941 (diff) | |
Merge "Getting rid of old hacky Libs conversion"
Diffstat (limited to 'java/java.go')
| -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) } } |