Support suffix property in bp2build

Support this in cc_{binary,library{,_shared}}

Bug: 204811222
Test: Suffix additions to cc_{binary,library{,_shared}}_conversion_test.go
Test: mixed_{libc,droid}.sh also builds newly allowlisted
Change-Id: I596694794b01b04c542cbcd7d54baeb7d914ba50
This commit is contained in:
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
2022-02-23 18:39:59 -05:00
parent 1520d7fb2d
commit a56e97042c
6 changed files with 235 additions and 25 deletions

View File

@@ -408,6 +408,8 @@ func libraryBp2Build(ctx android.TopDownMutatorContext, m *Module) {
sharedTargetAttrs.Has_stubs.SetValue(&hasStubs)
}
sharedTargetAttrs.Suffix = compilerAttrs.suffix
for axis, configToProps := range m.GetArchVariantProperties(ctx, &LibraryProperties{}) {
for config, props := range configToProps {
if props, ok := props.(*LibraryProperties); ok {
@@ -2647,6 +2649,8 @@ func sharedOrStaticLibraryBp2Build(ctx android.TopDownMutatorContext, module *Mo
},
Features: baseAttributes.features,
Suffix: compilerAttrs.suffix,
}
if compilerAttrs.stubsSymbolFile != nil && len(compilerAttrs.stubsVersions.Value) > 0 {
hasStubs := true
@@ -2729,6 +2733,8 @@ type bazelCcLibrarySharedAttributes struct {
Has_stubs bazel.BoolAttribute
Inject_bssl_hash bazel.BoolAttribute
Suffix bazel.StringAttribute
}
type bazelCcStubSuiteAttributes struct {