From 7873f613c4fd1c33a205e3fcbe7bac5ca40cee11 Mon Sep 17 00:00:00 2001 From: Zi Wang Date: Mon, 17 Jul 2023 16:36:19 -0700 Subject: [PATCH] java_test macro needs srcs and deps to create .jar for tradefed_test_suite Test: java_test_host_conversion_test.go and TH Bug: 280452825 Change-Id: Ibf0c7eed415fc58a4d228f0347ab125fdc4466e4 --- android/allowlists/allowlists.go | 2 -- bp2build/java_test_host_conversion_test.go | 9 +++++++++ java/java.go | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index d320599e1..fff41fc72 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -1493,8 +1493,6 @@ var ( "ICU4CTestRunner", "DeviceLongPollingStubTest", - "HelloWorldHostTest", // TODO(b/280452825): Convert HelloWorldHostTest to b test - "libprotobuf-full-test", // TODO(b/246997908): cannot convert proto_libraries which implicitly include other srcs in the same directory "libprotobuf-lite-test", // TODO(b/246997908): cannot convert proto_libraries which implicitly include other srcs in the same directory diff --git a/bp2build/java_test_host_conversion_test.go b/bp2build/java_test_host_conversion_test.go index f411ffb07..f41345e87 100644 --- a/bp2build/java_test_host_conversion_test.go +++ b/bp2build/java_test_host_conversion_test.go @@ -71,6 +71,11 @@ java_library { }), MakeBazelTarget("java_test", "java_test_host-1", AttrNameToString{ "runtime_deps": `[":java_test_host-1_lib"]`, + "deps": `[ + ":lib_a-neverlink", + ":static_libs_a", + ]`, + "srcs": `["a.java"]`, "target_compatible_with": `select({ "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], @@ -128,6 +133,10 @@ java_test_host { `, ExpectedBazelTargets: []string{ MakeBazelTarget("java_test", "java_test_host-1", AttrNameToString{ + "srcs": `[ + "a.java", + "b.kt", + ]`, "runtime_deps": `[":java_test_host-1_lib"]`, "target_compatible_with": `select({ "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], diff --git a/java/java.go b/java/java.go index 011dc1c54..2ed1130ff 100644 --- a/java/java.go +++ b/java/java.go @@ -3151,6 +3151,7 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) { type javaTestHostAttributes struct { *javaCommonAttributes + Srcs bazel.LabelListAttribute Deps bazel.LabelListAttribute Runtime_deps bazel.LabelListAttribute } @@ -3187,8 +3188,10 @@ func javaTestHostBp2Build(ctx android.TopDownMutatorContext, m *TestHost) { hasKotlin: bp2BuildInfo.hasKotlin, } libName := createLibraryTarget(ctx, libInfo) - attrs.Runtime_deps.Add(&bazel.LabelAttribute{Value: &bazel.Label{Label: ":" + libName}}) + attrs.Srcs = commonAttrs.Srcs + attrs.Deps = deps + attrs.Runtime_deps.Add(&bazel.LabelAttribute{Value: &bazel.Label{Label: ":" + libName}}) // Create the BazelTargetModule. ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: m.Name()}, attrs) }