StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support libs for java_plugin -> *

Browse Source 
Test: bp2build tests
Bug: 244210934
Change-Id: I7dbc820b23c4129485b0991aefb41e00e434d94e
This commit is contained in:
Alix
2022-11-08 17:22:18 +00:00
parent f02c7d882e
commit 53fae383d6
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bp2build/java_plugin_conversion_test.go
View File

@@ -60,7 +60,7 @@ java_library {
"//conditions:default": [], "//conditions:default": [],
})`, })`,
"deps": `[ "deps": `[
":java-lib-1", ":java-lib-1-neverlink",
":java-lib-2", ":java-lib-2",
]`, ]`,
"srcs": `[ "srcs": `[
@@ -101,7 +101,7 @@ java_library {
"//conditions:default": [], "//conditions:default": [],
})`, })`,
"deps": `[ "deps": `[
":java-lib-1", ":java-lib-1-neverlink",
":java-lib-2", ":java-lib-2",
]`, ]`,
}), }),

4
java/java.go
View File

@@ -2675,11 +2675,9 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
} }
if m.properties.Libs != nil { if m.properties.Libs != nil {
// TODO 244210934 ALIX Check if this else statement breaks presubmits get rid of it if it doesn't // TODO 244210934 ALIX Check if this else statement breaks presubmits get rid of it if it doesn't
modType := ctx.ModuleType() 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 { for _, d := range m.properties.Libs {
neverlinkLabel := android.BazelLabelForModuleDepSingle(ctx, d) neverlinkLabel := android.BazelLabelForModuleDepSingle(ctx, d)
neverlinkLabel.Label = neverlinkLabel.Label + "-neverlink" neverlinkLabel.Label = neverlinkLabel.Label + "-neverlink"