add clang_tidy properties to bp2build
Bug: 195029134 Test: m bp2build Change-Id: I9ca2436ef792911be72788b6640287726a609e2f
This commit is contained in:
@@ -646,6 +646,8 @@ func binaryBp2buildAttrs(ctx android.TopDownMutatorContext, m *Module) binaryAtt
|
||||
sdkAttributes: bp2BuildParseSdkAttributes(m),
|
||||
}
|
||||
|
||||
m.convertTidyAttributes(&attrs.tidyAttributes)
|
||||
|
||||
return attrs
|
||||
}
|
||||
|
||||
@@ -698,4 +700,6 @@ type binaryAttributes struct {
|
||||
Features bazel.StringListAttribute
|
||||
|
||||
sdkAttributes
|
||||
|
||||
tidyAttributes
|
||||
}
|
||||
|
@@ -66,6 +66,26 @@ type staticOrSharedAttributes struct {
|
||||
Native_coverage bazel.BoolAttribute
|
||||
|
||||
sdkAttributes
|
||||
|
||||
tidyAttributes
|
||||
}
|
||||
|
||||
type tidyAttributes struct {
|
||||
Tidy *bool
|
||||
Tidy_flags []string
|
||||
Tidy_checks []string
|
||||
Tidy_checks_as_errors []string
|
||||
}
|
||||
|
||||
func (m *Module) convertTidyAttributes(moduleAttrs *tidyAttributes) {
|
||||
for _, f := range m.features {
|
||||
if tidy, ok := f.(*tidyFeature); ok {
|
||||
moduleAttrs.Tidy = tidy.Properties.Tidy
|
||||
moduleAttrs.Tidy_flags = tidy.Properties.Tidy_flags
|
||||
moduleAttrs.Tidy_checks = tidy.Properties.Tidy_checks
|
||||
moduleAttrs.Tidy_checks_as_errors = tidy.Properties.Tidy_checks_as_errors
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// groupSrcsByExtension partitions `srcs` into groups based on file extension.
|
||||
|
@@ -2791,6 +2791,8 @@ func sharedOrStaticLibraryBp2Build(ctx android.TopDownMutatorContext, module *Mo
|
||||
Runtime_deps: linkerAttrs.runtimeDeps,
|
||||
}
|
||||
|
||||
module.convertTidyAttributes(&commonAttrs.tidyAttributes)
|
||||
|
||||
var attrs interface{}
|
||||
if isStatic {
|
||||
commonAttrs.Deps.Add(baseAttributes.protoDependency)
|
||||
|
@@ -643,6 +643,8 @@ type testBinaryAttributes struct {
|
||||
|
||||
Gtest bool
|
||||
Isolated bool
|
||||
|
||||
tidyAttributes
|
||||
}
|
||||
|
||||
// testBinaryBp2build is the bp2build converter for cc_test modules. A cc_test's
|
||||
@@ -676,6 +678,8 @@ func testBinaryBp2build(ctx android.TopDownMutatorContext, m *Module) {
|
||||
}
|
||||
}
|
||||
|
||||
m.convertTidyAttributes(&testBinaryAttrs.tidyAttributes)
|
||||
|
||||
for _, propIntf := range m.GetProperties() {
|
||||
if testLinkerProps, ok := propIntf.(*TestLinkerProperties); ok {
|
||||
testBinaryAttrs.Gtest = proptools.BoolDefault(testLinkerProps.Gtest, true)
|
||||
|
Reference in New Issue
Block a user