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

Don't use java_library for java_import neverlink

Browse Source 
Restricting use of sdk_version = "none" to only the rule types that will
correctly handled sdk_version = "none" by also handling system_module
attr

Test: CI && go tests
Change-Id: Ifa1c60ba8f5e3fcb28986cc84cdfaedcbd2d2957
This commit is contained in:
Liz Kammer
2023-10-11 15:24:24 -04:00
parent ba5f32a2f9
commit 4e00b0929b
2 changed files with 60 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
bp2build/java_import_conversion_test.go
View File

@@ -52,13 +52,15 @@ java_import {
} }
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("java_import", "example_import", AttrNameToString{ MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{
"jars": `["import.jar"]`, "srcs": `["import.jar"]`,
}), }),
MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{ MakeBazelTarget("java_import", "example_import", AttrNameToString{
"exports": `[":example_import"]`, "jars": `[":example_import-jars"]`,
"neverlink": `True`, }),
"sdk_version": `"none"`, MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{
"jars": `[":example_import-jars"]`,
"neverlink": `True`,
}), }),
}}) }})
} }
@@ -86,17 +88,19 @@ java_import {
} }
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("java_import", "example_import", AttrNameToString{ MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{
"jars": `select({ "srcs": `select({
"//build/bazel_common_rules/platforms/os:android": ["android.jar"], "//build/bazel_common_rules/platforms/os:android": ["android.jar"],
"//build/bazel_common_rules/platforms/os:linux_glibc": ["linux.jar"], "//build/bazel_common_rules/platforms/os:linux_glibc": ["linux.jar"],
"//conditions:default": [], "//conditions:default": [],
})`, })`,
}), }),
MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{ MakeBazelTarget("java_import", "example_import", AttrNameToString{
"exports": `[":example_import"]`, "jars": `[":example_import-jars"]`,
"neverlink": `True`, }),
"sdk_version": `"none"`, MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{
"jars": `[":example_import-jars"]`,
"neverlink": `True`,
}), }),
}}) }})
} }
@@ -117,13 +121,15 @@ java_import_host {
} }
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("java_import", "example_import", AttrNameToString{ MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{
"jars": `["import.jar"]`, "srcs": `["import.jar"]`,
}), }),
MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{ MakeBazelTarget("java_import", "example_import", AttrNameToString{
"exports": `[":example_import"]`, "jars": `[":example_import-jars"]`,
"neverlink": `True`, }),
"sdk_version": `"none"`, MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{
"jars": `[":example_import-jars"]`,
"neverlink": `True`,
}), }),
}}) }})
} }
@@ -142,13 +148,15 @@ func TestJavaImportSameNameAsJavaLibrary(t *testing.T) {
} }
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("java_import", "test_lib", AttrNameToString{ MakeBazelTarget("filegroup", "test_lib-jars", AttrNameToString{
"jars": `["test.jar"]`, "srcs": `["test.jar"]`,
}), }),
MakeBazelTarget("java_library", "test_lib-neverlink", AttrNameToString{ MakeBazelTarget("java_import", "test_lib", AttrNameToString{
"exports": `[":test_lib"]`, "jars": `[":test_lib-jars"]`,
"neverlink": `True`, }),
"sdk_version": `"none"`, MakeBazelTarget("java_import", "test_lib-neverlink", AttrNameToString{
"jars": `[":test_lib-jars"]`,
"neverlink": `True`,
}), }),
}, },
}, func(ctx android.RegistrationContext) { }, func(ctx android.RegistrationContext) {

43
java/java.go
View File

@@ -3403,9 +3403,14 @@ func createLibraryTarget(ctx android.Bp2buildMutatorContext, libInfo libraryCrea
return libName return libName
} }
type bazelJavaImportAttributes struct { type importAttributes struct {
Jars bazel.LabelListAttribute Jars bazel.LabelListAttribute
Exports bazel.LabelListAttribute Exports bazel.LabelListAttribute
Neverlink *bool
}
type filegroupAttrs struct {
Srcs bazel.LabelListAttribute
} }
// java_import bp2Build converter. // java_import bp2Build converter.
@@ -3421,28 +3426,36 @@ func (i *Import) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) {
} }
} }
attrs := &bazelJavaImportAttributes{ name := android.RemoveOptionalPrebuiltPrefix(i.Name())
Jars: jars, filegroupTargetName := name + "-jars"
ctx.CreateBazelTargetModule(
bazel.BazelTargetModuleProperties{
Rule_class: "filegroup",
Bzl_load_location: "//build/bazel/rules:filegroup.bzl",
},
android.CommonAttributes{Name: filegroupTargetName},
&filegroupAttrs{
Srcs: jars,
},
)
attrs := &importAttributes{
Jars: bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + filegroupTargetName}),
} }
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: "java_import", Rule_class: "java_import",
Bzl_load_location: "//build/bazel/rules/java:import.bzl", Bzl_load_location: "//build/bazel/rules/java:import.bzl",
} }
name := android.RemoveOptionalPrebuiltPrefix(i.Name())
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name}, attrs) ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name}, attrs)
neverlink := true neverlinkAttrs := &importAttributes{
neverlinkAttrs := &javaLibraryAttributes{ Jars: attrs.Jars,
Neverlink: bazel.BoolAttribute{Value: &neverlink}, Neverlink: proptools.BoolPtr(true),
Exports: bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + name}),
javaCommonAttributes: &javaCommonAttributes{
Sdk_version: bazel.StringAttribute{Value: proptools.StringPtr("none")},
},
} }
ctx.CreateBazelTargetModule( ctx.CreateBazelTargetModule(
javaLibraryBazelTargetModuleProperties(), props,
android.CommonAttributes{Name: name + "-neverlink"}, android.CommonAttributes{Name: name + "-neverlink"},
neverlinkAttrs) neverlinkAttrs)
} }