diff options
| author | 2023-01-19 15:30:38 +0000 | |
|---|---|---|
| committer | 2023-01-19 15:39:49 +0000 | |
| commit | 684f63ab5ab0dc7680c901b9a761a21f36df9941 (patch) | |
| tree | 1510b7cbed2340a16ec30fb58760e55e2e9e04de | |
| parent | fbd7fabf0acce78f3913abb342300f76fd7c4e73 (diff) | |
Getting rid of old hacky Libs conversion
Now that libs conversion is happening for the needed module_types,
removing if statement with old hacky libs conversion
Test: Presubmit
Bug: 244210934
Change-Id: I92bb2080eeb7dcb85d087a3ff6054bdf8675ec54
| -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) } } |