diff options
| -rw-r--r-- | bp2build/cc_library_conversion_test.go | 35 | ||||
| -rw-r--r-- | cc/binary.go | 2 | ||||
| -rw-r--r-- | cc/bp2build.go | 16 | ||||
| -rw-r--r-- | cc/library.go | 2 | ||||
| -rw-r--r-- | cc/test.go | 2 |
5 files changed, 53 insertions, 4 deletions
diff --git a/bp2build/cc_library_conversion_test.go b/bp2build/cc_library_conversion_test.go index 0d6d5b87e..4c86374b5 100644 --- a/bp2build/cc_library_conversion_test.go +++ b/bp2build/cc_library_conversion_test.go @@ -3508,3 +3508,38 @@ cc_library_static { }, }) } + +func TestCcLibraryWithTidy(t *testing.T) { + runCcLibraryTestCase(t, Bp2buildTestCase{ + Description: "cc_library uses tidy properties", + ModuleTypeUnderTest: "cc_library", + ModuleTypeUnderTestFactory: cc.LibraryFactory, + Blueprint: ` +cc_library_static { + name: "foo", + srcs: ["foo.cpp"], + tidy: true, + tidy_checks: ["check1", "check2"], + tidy_checks_as_errors: ["check1error", "check2error"], + tidy_disabled_srcs: ["bar.cpp"], + tidy_timeout_srcs: ["baz.cpp"], +}`, + ExpectedBazelTargets: []string{ + MakeBazelTarget("cc_library_static", "foo", AttrNameToString{ + "local_includes": `["."]`, + "srcs": `["foo.cpp"]`, + "tidy": `True`, + "tidy_checks": `[ + "check1", + "check2", + ]`, + "tidy_checks_as_errors": `[ + "check1error", + "check2error", + ]`, + "tidy_disabled_srcs": `["bar.cpp"]`, + "tidy_timeout_srcs": `["baz.cpp"]`, + }), + }, + }) +} diff --git a/cc/binary.go b/cc/binary.go index d09e74458..c2868e7bb 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -646,7 +646,7 @@ func binaryBp2buildAttrs(ctx android.TopDownMutatorContext, m *Module) binaryAtt sdkAttributes: bp2BuildParseSdkAttributes(m), } - m.convertTidyAttributes(&attrs.tidyAttributes) + m.convertTidyAttributes(ctx, &attrs.tidyAttributes) return attrs } diff --git a/cc/bp2build.go b/cc/bp2build.go index 2f79caec7..6caa85422 100644 --- a/cc/bp2build.go +++ b/cc/bp2build.go @@ -75,9 +75,11 @@ type tidyAttributes struct { Tidy_flags []string Tidy_checks []string Tidy_checks_as_errors []string + Tidy_disabled_srcs bazel.LabelListAttribute + Tidy_timeout_srcs bazel.LabelListAttribute } -func (m *Module) convertTidyAttributes(moduleAttrs *tidyAttributes) { +func (m *Module) convertTidyAttributes(ctx android.BaseMutatorContext, moduleAttrs *tidyAttributes) { for _, f := range m.features { if tidy, ok := f.(*tidyFeature); ok { moduleAttrs.Tidy = tidy.Properties.Tidy @@ -85,6 +87,18 @@ func (m *Module) convertTidyAttributes(moduleAttrs *tidyAttributes) { moduleAttrs.Tidy_checks = tidy.Properties.Tidy_checks moduleAttrs.Tidy_checks_as_errors = tidy.Properties.Tidy_checks_as_errors } + + } + archVariantProps := m.GetArchVariantProperties(ctx, &BaseCompilerProperties{}) + for axis, configToProps := range archVariantProps { + for config, _props := range configToProps { + if archProps, ok := _props.(*BaseCompilerProperties); ok { + archDisabledSrcs := android.BazelLabelForModuleSrc(ctx, archProps.Tidy_disabled_srcs) + moduleAttrs.Tidy_disabled_srcs.SetSelectValue(axis, config, archDisabledSrcs) + archTimeoutSrcs := android.BazelLabelForModuleSrc(ctx, archProps.Tidy_timeout_srcs) + moduleAttrs.Tidy_timeout_srcs.SetSelectValue(axis, config, archTimeoutSrcs) + } + } } } diff --git a/cc/library.go b/cc/library.go index ef10e7cc2..03a55752b 100644 --- a/cc/library.go +++ b/cc/library.go @@ -2792,7 +2792,7 @@ func sharedOrStaticLibraryBp2Build(ctx android.TopDownMutatorContext, module *Mo Runtime_deps: linkerAttrs.runtimeDeps, } - module.convertTidyAttributes(&commonAttrs.tidyAttributes) + module.convertTidyAttributes(ctx, &commonAttrs.tidyAttributes) var attrs interface{} if isStatic { diff --git a/cc/test.go b/cc/test.go index 92055fa93..536210ba4 100644 --- a/cc/test.go +++ b/cc/test.go @@ -678,7 +678,7 @@ func testBinaryBp2build(ctx android.TopDownMutatorContext, m *Module) { } } - m.convertTidyAttributes(&testBinaryAttrs.tidyAttributes) + m.convertTidyAttributes(ctx, &testBinaryAttrs.tidyAttributes) for _, propIntf := range m.GetProperties() { if testLinkerProps, ok := propIntf.(*TestLinkerProperties); ok { |