diff options
| author | Alix Espino <agespino@google.com> | 2023-01-17 14:31:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-17 14:31:18 +0000 |
| commit | f02c7d882e9fb546864902004da38139bc1c6c1f (patch) | |
| tree | 551fbe2219f6e82535a162b048f3aa5cd88a128b /java/java.go | |
| parent | ee37e8e8ed84cfd495b76348c7ed7e210d0df60f (diff) | |
| parent | 6c087cf01a69f20f791c1cd97272fab94d16bd0d (diff) | |
Merge "libs support for android_app->* edge"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index cc7444941..443ad9bb4 100644 --- a/java/java.go +++ b/java/java.go @@ -2677,7 +2677,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 - if strings.HasPrefix(ctx.ModuleType(), "java_binary") || strings.HasPrefix(ctx.ModuleType(), "java_library") || ctx.ModuleType() == "android_library" { + + modType := ctx.ModuleType() + if strings.HasPrefix(modType, "java_binary") || strings.HasPrefix(modType, "java_library") || modType == "android_app" || modType == "android_library" { for _, d := range m.properties.Libs { neverlinkLabel := android.BazelLabelForModuleDepSingle(ctx, d) neverlinkLabel.Label = neverlinkLabel.Label + "-neverlink" |