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

Use CommonAttributes.Data for cc_test.data.

Browse Source 
data is a common attr like name, so avoid redefining it in testBinaryAttrs.

Test: presubmits
Change-Id: Ia694b94620dfad6b8411e5a1b6c530843983ca01
This commit is contained in:
Jingwen Chen
2022-09-01 18:54:50 +00:00
parent 6faa161557
commit ebdc20f571
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/test.go
View File

@@ -643,7 +643,6 @@ type testBinaryAttributes struct {
Gtest bool Gtest bool
Isolated bool Isolated bool
Data bazel.LabelListAttribute
} }
// testBinaryBp2build is the bp2build converter for cc_test modules. A cc_test's // testBinaryBp2build is the bp2build converter for cc_test modules. A cc_test's
@@ -659,6 +658,8 @@ func testBinaryBp2build(ctx android.TopDownMutatorContext, m *Module) {
var testBinaryAttrs testBinaryAttributes var testBinaryAttrs testBinaryAttributes
testBinaryAttrs.binaryAttributes = binaryBp2buildAttrs(ctx, m) testBinaryAttrs.binaryAttributes = binaryBp2buildAttrs(ctx, m)
var data bazel.LabelListAttribute
testBinaryProps := m.GetArchVariantProperties(ctx, &TestBinaryProperties{}) testBinaryProps := m.GetArchVariantProperties(ctx, &TestBinaryProperties{})
for axis, configToProps := range testBinaryProps { for axis, configToProps := range testBinaryProps {
for config, props := range configToProps { for config, props := range configToProps {
@@ -668,7 +669,7 @@ func testBinaryBp2build(ctx android.TopDownMutatorContext, m *Module) {
combinedData.Append(android.BazelLabelForModuleSrc(ctx, p.Data)) combinedData.Append(android.BazelLabelForModuleSrc(ctx, p.Data))
combinedData.Append(android.BazelLabelForModuleDeps(ctx, p.Data_bins)) combinedData.Append(android.BazelLabelForModuleDeps(ctx, p.Data_bins))
combinedData.Append(android.BazelLabelForModuleDeps(ctx, p.Data_libs)) combinedData.Append(android.BazelLabelForModuleDeps(ctx, p.Data_libs))
testBinaryAttrs.Data.SetSelectValue(axis, config, combinedData) data.SetSelectValue(axis, config, combinedData)
} }
} }
} }
@@ -686,6 +687,9 @@ func testBinaryBp2build(ctx android.TopDownMutatorContext, m *Module) {
Rule_class: "cc_test", Rule_class: "cc_test",
Bzl_load_location: "//build/bazel/rules/cc:cc_test.bzl", Bzl_load_location: "//build/bazel/rules/cc:cc_test.bzl",
}, },
android.CommonAttributes{Name: m.Name()}, android.CommonAttributes{
Name: m.Name(),
Data: data,
},
&testBinaryAttrs) &testBinaryAttrs)
} }