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

Do not convert java libraries with core_platform

Browse Source 
Test: go bp2build tests
Change-Id: I2769c0d589c304caeb24a8ecba38a4a5ee6c63e5
This commit is contained in:
Liz Kammer
2023-09-07 15:59:42 -04:00
parent 7d885d53a6
commit 65942c8467
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bp2build/java_library_conversion_test.go
View File

@@ -1046,3 +1046,14 @@ filegroup {
ctx.RegisterModuleType("filegroup", android.FileGroupFactory)
})
}
func TestJavaSdkVersionCorePlatformDoesNotConvert(t *testing.T) {
runJavaLibraryTestCase(t, Bp2buildTestCase{
Blueprint: `java_library {
name: "java-lib-1",
sdk_version: "core_platform",
bazel_module: { bp2build_available: true },
}`,
ExpectedBazelTargets: []string{},
})
}

5
java/java.go
View File

@@ -2904,8 +2904,13 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
var staticDeps bazel.LabelListAttribute
if proptools.String(m.deviceProperties.Sdk_version) == "" && m.DeviceSupported() {
// TODO(b/297356704): handle platform apis in bp2build
ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_PROPERTY_UNSUPPORTED, "sdk_version unset")
return &javaCommonAttributes{}, &bp2BuildJavaInfo{}, false
} else if proptools.String(m.deviceProperties.Sdk_version) == "core_platform" {
// TODO(b/297356582): handle core_platform in bp2build
ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_PROPERTY_UNSUPPORTED, "sdk_version core_platform")
return &javaCommonAttributes{}, &bp2BuildJavaInfo{}, false
}
archVariantProps := m.GetArchVariantProperties(ctx, &CommonProperties{})