diff options
| author | 2023-09-07 15:59:42 -0400 | |
|---|---|---|
| committer | 2023-09-08 09:43:57 -0400 | |
| commit | 65942c8467c243c6b8f53e680da3126fedbc3e3b (patch) | |
| tree | 4740a9210ffb8fc282231567bba336f180bbddaf | |
| parent | 7d885d53a66fc5e348b5d500a003c8ee66e1ee6c (diff) | |
Do not convert java libraries with core_platform
Test: go bp2build tests
Change-Id: I2769c0d589c304caeb24a8ecba38a4a5ee6c63e5
| -rw-r--r-- | bp2build/java_library_conversion_test.go | 11 | ||||
| -rw-r--r-- | java/java.go | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/bp2build/java_library_conversion_test.go b/bp2build/java_library_conversion_test.go index 7429ae6df..990869133 100644 --- a/bp2build/java_library_conversion_test.go +++ b/bp2build/java_library_conversion_test.go @@ -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{}, + }) +} diff --git a/java/java.go b/java/java.go index 521aef301..967f8c297 100644 --- a/java/java.go +++ b/java/java.go @@ -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{}) |