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
This commit is contained in:
parent
adb892c539
commit
7873f613c4
3 changed files with 13 additions and 3 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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"],
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue