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

bp2build: arch-configurable selects for label list attrs.

Browse Source 
This CL adds the configurable LabelListAttribute support to bp2build.

Test: go test
Change-Id: I2ef9e385d9cf1b1845988128eca1d8cda1ecb5e8
This commit is contained in:
Jingwen Chen
2021-03-15 06:02:43 -04:00
parent 053520a86a
commit 0702791a99
12 changed files with 226 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/filegroup.go
View File

@@ -30,7 +30,7 @@ var PrepareForTestWithFilegroup = FixtureRegisterWithContext(func(ctx Registrati
// https://docs.bazel.build/versions/master/be/general.html#filegroup // https://docs.bazel.build/versions/master/be/general.html#filegroup
type bazelFilegroupAttributes struct { type bazelFilegroupAttributes struct {
Srcs bazel.LabelList Srcs bazel.LabelListAttribute
} }
type bazelFilegroup struct { type bazelFilegroup struct {
@@ -57,8 +57,10 @@ func FilegroupBp2Build(ctx TopDownMutatorContext) {
return return
} }
srcs := bazel.MakeLabelListAttribute(
BazelLabelForModuleSrcExcludes(ctx, fg.properties.Srcs, fg.properties.Exclude_srcs))
attrs := &bazelFilegroupAttributes{ attrs := &bazelFilegroupAttributes{
Srcs: BazelLabelForModuleSrcExcludes(ctx, fg.properties.Srcs, fg.properties.Exclude_srcs), Srcs: srcs,
} }
props := bazel.BazelTargetModuleProperties{Rule_class: "filegroup"} props := bazel.BazelTargetModuleProperties{Rule_class: "filegroup"}

3
android/paths.go
View File

@@ -477,6 +477,9 @@ func expandSrcsForBazel(ctx BazelConversionPathContext, paths, expandedExcludes
// already be resolved by either deps mutator or path deps mutator. // already be resolved by either deps mutator or path deps mutator.
func getOtherModuleLabel(ctx BazelConversionPathContext, dep, tag string) bazel.Label { func getOtherModuleLabel(ctx BazelConversionPathContext, dep, tag string) bazel.Label {
m, _ := ctx.GetDirectDep(dep) m, _ := ctx.GetDirectDep(dep)
if m == nil {
panic(fmt.Errorf("cannot get direct dep %s of %s", dep, ctx.Module().Name()))
}
otherLabel := bazelModuleLabel(ctx, m, tag) otherLabel := bazelModuleLabel(ctx, m, tag)
label := bazelModuleLabel(ctx, ctx.Module(), "") label := bazelModuleLabel(ctx, ctx.Module(), "")
if samePackage(label, otherLabel) { if samePackage(label, otherLabel) {

117
bazel/properties.go
View File

@@ -76,6 +76,92 @@ func UniqueBazelLabelList(originalLabelList LabelList) LabelList {
return uniqueLabelList return uniqueLabelList
} }
const (
ARCH_X86 = "x86"
ARCH_X86_64 = "x86_64"
ARCH_ARM = "arm"
ARCH_ARM64 = "arm64"
)
var (
// This is the list of architectures with a Bazel config_setting and
// constraint value equivalent. is actually android.ArchTypeList, but the
// android package depends on the bazel package, so a cyclic dependency
// prevents using that here.
selectableArchs = []string{ARCH_X86, ARCH_X86_64, ARCH_ARM, ARCH_ARM64}
)
// Arch-specific label_list typed Bazel attribute values. This should correspond
// to the types of architectures supported for compilation in arch.go.
type labelListArchValues struct {
X86 LabelList
X86_64 LabelList
Arm LabelList
Arm64 LabelList
// TODO(b/181299724): this is currently missing the "common" arch, which
// doesn't have an equivalent platform() definition yet.
}
// LabelListAttribute is used to represent a list of Bazel labels as an
// attribute.
type LabelListAttribute struct {
// The non-arch specific attribute label list Value. Required.
Value LabelList
// The arch-specific attribute label list values. Optional. If used, these
// are generated in a select statement and appended to the non-arch specific
// label list Value.
ArchValues labelListArchValues
}
// MakeLabelListAttribute initializes a LabelListAttribute with the non-arch specific value.
func MakeLabelListAttribute(value LabelList) LabelListAttribute {
return LabelListAttribute{Value: UniqueBazelLabelList(value)}
}
// HasArchSpecificValues returns true if the attribute contains
// architecture-specific label_list values.
func (attrs *LabelListAttribute) HasArchSpecificValues() bool {
for _, arch := range selectableArchs {
if len(attrs.GetValueForArch(arch).Includes) > 0 || len(attrs.GetValueForArch(arch).Excludes) > 0 {
return true
}
}
return false
}
// GetValueForArch returns the label_list attribute value for an architecture.
func (attrs *LabelListAttribute) GetValueForArch(arch string) LabelList {
switch arch {
case ARCH_X86:
return attrs.ArchValues.X86
case ARCH_X86_64:
return attrs.ArchValues.X86_64
case ARCH_ARM:
return attrs.ArchValues.Arm
case ARCH_ARM64:
return attrs.ArchValues.Arm64
default:
panic(fmt.Errorf("Unknown arch: %s", arch))
}
}
// SetValueForArch sets the label_list attribute value for an architecture.
func (attrs *LabelListAttribute) SetValueForArch(arch string, value LabelList) {
switch arch {
case "x86":
attrs.ArchValues.X86 = value
case "x86_64":
attrs.ArchValues.X86_64 = value
case "arm":
attrs.ArchValues.Arm = value
case "arm64":
attrs.ArchValues.Arm64 = value
default:
panic(fmt.Errorf("Unknown arch: %s", arch))
}
}
// StringListAttribute corresponds to the string_list Bazel attribute type with // StringListAttribute corresponds to the string_list Bazel attribute type with
// support for additional metadata, like configurations. // support for additional metadata, like configurations.
type StringListAttribute struct { type StringListAttribute struct {
@@ -89,11 +175,10 @@ type StringListAttribute struct {
// Arch-specific string_list typed Bazel attribute values. This should correspond // Arch-specific string_list typed Bazel attribute values. This should correspond
// to the types of architectures supported for compilation in arch.go. // to the types of architectures supported for compilation in arch.go.
type stringListArchValues struct { type stringListArchValues struct {
X86 []string X86 []string
X86_64 []string X86_64 []string
Arm []string Arm []string
Arm64 []string Arm64 []string
Default []string
// TODO(b/181299724): this is currently missing the "common" arch, which // TODO(b/181299724): this is currently missing the "common" arch, which
// doesn't have an equivalent platform() definition yet. // doesn't have an equivalent platform() definition yet.
} }
@@ -101,7 +186,7 @@ type stringListArchValues struct {
// HasArchSpecificValues returns true if the attribute contains // HasArchSpecificValues returns true if the attribute contains
// architecture-specific string_list values. // architecture-specific string_list values.
func (attrs *StringListAttribute) HasArchSpecificValues() bool { func (attrs *StringListAttribute) HasArchSpecificValues() bool {
for _, arch := range []string{"x86", "x86_64", "arm", "arm64", "default"} { for _, arch := range selectableArchs {
if len(attrs.GetValueForArch(arch)) > 0 { if len(attrs.GetValueForArch(arch)) > 0 {
return true return true
} }
@@ -112,16 +197,14 @@ func (attrs *StringListAttribute) HasArchSpecificValues() bool {
// GetValueForArch returns the string_list attribute value for an architecture. // GetValueForArch returns the string_list attribute value for an architecture.
func (attrs *StringListAttribute) GetValueForArch(arch string) []string { func (attrs *StringListAttribute) GetValueForArch(arch string) []string {
switch arch { switch arch {
case "x86": case ARCH_X86:
return attrs.ArchValues.X86 return attrs.ArchValues.X86
case "x86_64": case ARCH_X86_64:
return attrs.ArchValues.X86_64 return attrs.ArchValues.X86_64
case "arm": case ARCH_ARM:
return attrs.ArchValues.Arm return attrs.ArchValues.Arm
case "arm64": case ARCH_ARM64:
return attrs.ArchValues.Arm64 return attrs.ArchValues.Arm64
case "default":
return attrs.ArchValues.Default
default: default:
panic(fmt.Errorf("Unknown arch: %s", arch)) panic(fmt.Errorf("Unknown arch: %s", arch))
} }
@@ -130,16 +213,14 @@ func (attrs *StringListAttribute) GetValueForArch(arch string) []string {
// SetValueForArch sets the string_list attribute value for an architecture. // SetValueForArch sets the string_list attribute value for an architecture.
func (attrs *StringListAttribute) SetValueForArch(arch string, value []string) { func (attrs *StringListAttribute) SetValueForArch(arch string, value []string) {
switch arch { switch arch {
case "x86": case ARCH_X86:
attrs.ArchValues.X86 = value attrs.ArchValues.X86 = value
case "x86_64": case ARCH_X86_64:
attrs.ArchValues.X86_64 = value attrs.ArchValues.X86_64 = value
case "arm": case ARCH_ARM:
attrs.ArchValues.Arm = value attrs.ArchValues.Arm = value
case "arm64": case ARCH_ARM64:
attrs.ArchValues.Arm64 = value attrs.ArchValues.Arm64 = value
case "default":
attrs.ArchValues.Default = value
default: default:
panic(fmt.Errorf("Unknown arch: %s", arch)) panic(fmt.Errorf("Unknown arch: %s", arch))
} }

32
bp2build/build_conversion.go
View File

@@ -415,9 +415,34 @@ func prettyPrint(propertyValue reflect.Value, indent int) (string, error) {
case reflect.Struct: case reflect.Struct:
// Special cases where the bp2build sends additional information to the codegenerator // Special cases where the bp2build sends additional information to the codegenerator
// by wrapping the attributes in a custom struct type. // by wrapping the attributes in a custom struct type.
if labels, ok := propertyValue.Interface().(bazel.LabelList); ok { if labels, ok := propertyValue.Interface().(bazel.LabelListAttribute); ok {
// TODO(b/165114590): convert glob syntax // TODO(b/165114590): convert glob syntax
return prettyPrint(reflect.ValueOf(labels.Includes), indent) ret, err := prettyPrint(reflect.ValueOf(labels.Value.Includes), indent)
if err != nil {
return ret, err
}
if !labels.HasArchSpecificValues() {
// Select statement not needed.
return ret, nil
}
ret += " + " + "select({\n"
for _, arch := range android.ArchTypeList() {
value := labels.GetValueForArch(arch.Name)
if len(value.Includes) > 0 {
ret += makeIndent(indent + 1)
list, _ := prettyPrint(reflect.ValueOf(value.Includes), indent+1)
ret += fmt.Sprintf("\"%s\": %s,\n", platformArchMap[arch], list)
}
}
ret += makeIndent(indent + 1)
ret += fmt.Sprintf("\"%s\": [],\n", "//conditions:default")
ret += makeIndent(indent)
ret += "})"
return ret, err
} else if label, ok := propertyValue.Interface().(bazel.Label); ok { } else if label, ok := propertyValue.Interface().(bazel.Label); ok {
return fmt.Sprintf("%q", label.Label), nil return fmt.Sprintf("%q", label.Label), nil
} else if stringList, ok := propertyValue.Interface().(bazel.StringListAttribute); ok { } else if stringList, ok := propertyValue.Interface().(bazel.StringListAttribute); ok {
@@ -443,8 +468,7 @@ func prettyPrint(propertyValue reflect.Value, indent int) (string, error) {
} }
ret += makeIndent(indent + 1) ret += makeIndent(indent + 1)
list, _ := prettyPrint(reflect.ValueOf(stringList.GetValueForArch("default")), indent+1) ret += fmt.Sprintf("\"%s\": [],\n", "//conditions:default")
ret += fmt.Sprintf("\"%s\": %s,\n", "//conditions:default", list)
ret += makeIndent(indent) ret += makeIndent(indent)
ret += "})" ret += "})"

4
bp2build/build_conversion_test.go
View File

@@ -502,8 +502,6 @@ genrule {
expectedBazelTargets: []string{ expectedBazelTargets: []string{
`filegroup( `filegroup(
name = "fg_foo", name = "fg_foo",
srcs = [
],
)`, )`,
}, },
}, },
@@ -1101,8 +1099,8 @@ genrule {
"out", "out",
], ],
srcs = [ srcs = [
"srcs-from-3",
"in1", "in1",
"srcs-from-3",
], ],
)`, )`,
description: "genrule applies properties from genrule_defaults transitively", description: "genrule applies properties from genrule_defaults transitively",

44
bp2build/cc_object_conversion_test.go
View File

@@ -74,8 +74,8 @@ func TestCcObjectBp2Build(t *testing.T) {
], ],
srcs = [ srcs = [
"a/b/bar.h", "a/b/bar.h",
"a/b/foo.h",
"a/b/c.c", "a/b/c.c",
"a/b/foo.h",
], ],
)`, )`,
}, },
@@ -278,9 +278,13 @@ func TestCcObjectConfigurableAttributesBp2Build(t *testing.T) {
moduleTypeUnderTestBp2BuildMutator: cc.ObjectBp2Build, moduleTypeUnderTestBp2BuildMutator: cc.ObjectBp2Build,
blueprint: `cc_object { blueprint: `cc_object {
name: "foo", name: "foo",
srcs: ["a.cpp"],
arch: { arch: {
x86: { x86: {
cflags: ["-fPIC"], cflags: ["-fPIC"], // string list
},
arm: {
srcs: ["arch/arm/file.S"], // label list
}, },
}, },
bazel_module: { bp2build_available: true }, bazel_module: { bp2build_available: true },
@@ -295,12 +299,19 @@ func TestCcObjectConfigurableAttributesBp2Build(t *testing.T) {
"@bazel_tools//platforms:x86_32": [ "@bazel_tools//platforms:x86_32": [
"-fPIC", "-fPIC",
], ],
"//conditions:default": [ "//conditions:default": [],
],
}), }),
local_include_dirs = [ local_include_dirs = [
".", ".",
], ],
srcs = [
"a.cpp",
] + select({
"@bazel_tools//platforms:arm": [
"arch/arm/file.S",
],
"//conditions:default": [],
}),
)`, )`,
}, },
}, },
@@ -311,17 +322,22 @@ func TestCcObjectConfigurableAttributesBp2Build(t *testing.T) {
moduleTypeUnderTestBp2BuildMutator: cc.ObjectBp2Build, moduleTypeUnderTestBp2BuildMutator: cc.ObjectBp2Build,
blueprint: `cc_object { blueprint: `cc_object {
name: "foo", name: "foo",
srcs: ["base.cpp"],
arch: { arch: {
x86: { x86: {
srcs: ["x86.cpp"],
cflags: ["-fPIC"], cflags: ["-fPIC"],
}, },
x86_64: { x86_64: {
srcs: ["x86_64.cpp"],
cflags: ["-fPIC"], cflags: ["-fPIC"],
}, },
arm: { arm: {
srcs: ["arm.cpp"],
cflags: ["-Wall"], cflags: ["-Wall"],
}, },
arm64: { arm64: {
srcs: ["arm64.cpp"],
cflags: ["-Wall"], cflags: ["-Wall"],
}, },
}, },
@@ -346,12 +362,28 @@ func TestCcObjectConfigurableAttributesBp2Build(t *testing.T) {
"@bazel_tools//platforms:x86_64": [ "@bazel_tools//platforms:x86_64": [
"-fPIC", "-fPIC",
], ],
"//conditions:default": [ "//conditions:default": [],
],
}), }),
local_include_dirs = [ local_include_dirs = [
".", ".",
], ],
srcs = [
"base.cpp",
] + select({
"@bazel_tools//platforms:arm": [
"arm.cpp",
],
"@bazel_tools//platforms:aarch64": [
"arm64.cpp",
],
"@bazel_tools//platforms:x86_32": [
"x86.cpp",
],
"@bazel_tools//platforms:x86_64": [
"x86_64.cpp",
],
"//conditions:default": [],
}),
)`, )`,
}, },
}, },

32
cc/library.go
View File

@@ -2029,7 +2029,7 @@ func maybeInjectBoringSSLHash(ctx android.ModuleContext, outputFile android.Modu
return outputFile return outputFile
} }
func Bp2BuildParseHeaderLibs(ctx android.TopDownMutatorContext, module *Module) bazel.LabelList { func Bp2BuildParseHeaderLibs(ctx android.TopDownMutatorContext, module *Module) bazel.LabelListAttribute {
var headerLibs []string var headerLibs []string
for _, linkerProps := range module.linker.linkerProps() { for _, linkerProps := range module.linker.linkerProps() {
if baseLinkerProps, ok := linkerProps.(*BaseLinkerProperties); ok { if baseLinkerProps, ok := linkerProps.(*BaseLinkerProperties); ok {
@@ -2038,12 +2038,11 @@ func Bp2BuildParseHeaderLibs(ctx android.TopDownMutatorContext, module *Module)
break break
} }
} }
headerLibsLabels := bazel.MakeLabelListAttribute(android.BazelLabelForModuleDeps(ctx, headerLibs))
headerLibsLabels := android.BazelLabelForModuleDeps(ctx, headerLibs)
return headerLibsLabels return headerLibsLabels
} }
func Bp2BuildParseExportedIncludes(ctx android.TopDownMutatorContext, module *Module) (bazel.LabelList, bazel.LabelList) { func Bp2BuildParseExportedIncludes(ctx android.TopDownMutatorContext, module *Module) (bazel.LabelListAttribute, bazel.LabelListAttribute) {
libraryDecorator := module.linker.(*libraryDecorator) libraryDecorator := module.linker.(*libraryDecorator)
includeDirs := libraryDecorator.flagExporter.Properties.Export_system_include_dirs includeDirs := libraryDecorator.flagExporter.Properties.Export_system_include_dirs
@@ -2059,17 +2058,16 @@ func Bp2BuildParseExportedIncludes(ctx android.TopDownMutatorContext, module *Mo
} }
headersLabels := android.BazelLabelForModuleSrc(ctx, includeDirGlobs) headersLabels := android.BazelLabelForModuleSrc(ctx, includeDirGlobs)
return bazel.MakeLabelListAttribute(includeDirsLabels), bazel.MakeLabelListAttribute(headersLabels)
return includeDirsLabels, headersLabels
} }
type bazelCcLibraryStaticAttributes struct { type bazelCcLibraryStaticAttributes struct {
Copts []string Copts []string
Srcs bazel.LabelList Srcs bazel.LabelListAttribute
Deps bazel.LabelList Deps bazel.LabelListAttribute
Linkstatic bool Linkstatic bool
Includes bazel.LabelList Includes bazel.LabelListAttribute
Hdrs bazel.LabelList Hdrs bazel.LabelListAttribute
} }
type bazelCcLibraryStatic struct { type bazelCcLibraryStatic struct {
@@ -2110,7 +2108,7 @@ func CcLibraryStaticBp2Build(ctx android.TopDownMutatorContext) {
break break
} }
} }
srcsLabels := android.BazelLabelForModuleSrc(ctx, srcs) srcsLabels := bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, srcs))
var staticLibs []string var staticLibs []string
var wholeStaticLibs []string var wholeStaticLibs []string
@@ -2135,18 +2133,18 @@ func CcLibraryStaticBp2Build(ctx android.TopDownMutatorContext) {
includesLabels := android.BazelLabelForModuleSrc(ctx, allIncludes) includesLabels := android.BazelLabelForModuleSrc(ctx, allIncludes)
exportedIncludesLabels, exportedIncludesHeadersLabels := Bp2BuildParseExportedIncludes(ctx, module) exportedIncludesLabels, exportedIncludesHeadersLabels := Bp2BuildParseExportedIncludes(ctx, module)
includesLabels.Append(exportedIncludesLabels) includesLabels.Append(exportedIncludesLabels.Value)
headerLibsLabels := Bp2BuildParseHeaderLibs(ctx, module) headerLibsLabels := Bp2BuildParseHeaderLibs(ctx, module)
depsLabels.Append(headerLibsLabels) depsLabels.Append(headerLibsLabels.Value)
attrs := &bazelCcLibraryStaticAttributes{ attrs := &bazelCcLibraryStaticAttributes{
Copts: copts, Copts: copts,
Srcs: bazel.UniqueBazelLabelList(srcsLabels), Srcs: srcsLabels,
Deps: bazel.UniqueBazelLabelList(depsLabels), Deps: bazel.MakeLabelListAttribute(depsLabels),
Linkstatic: true, Linkstatic: true,
Includes: bazel.UniqueBazelLabelList(includesLabels), Includes: bazel.MakeLabelListAttribute(includesLabels),
Hdrs: bazel.UniqueBazelLabelList(exportedIncludesHeadersLabels), Hdrs: exportedIncludesHeadersLabels,
} }
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{

6
cc/library_headers.go
View File

@@ -62,9 +62,9 @@ func prebuiltLibraryHeaderFactory() android.Module {
} }
type bazelCcLibraryHeadersAttributes struct { type bazelCcLibraryHeadersAttributes struct {
Hdrs bazel.LabelList Hdrs bazel.LabelListAttribute
Includes bazel.LabelList Includes bazel.LabelListAttribute
Deps bazel.LabelList Deps bazel.LabelListAttribute
} }
type bazelCcLibraryHeaders struct { type bazelCcLibraryHeaders struct {

23
cc/object.go
View File

@@ -103,8 +103,8 @@ func ObjectFactory() android.Module {
// For bp2build conversion. // For bp2build conversion.
type bazelObjectAttributes struct { type bazelObjectAttributes struct {
Srcs bazel.LabelList Srcs bazel.LabelListAttribute
Deps bazel.LabelList Deps bazel.LabelListAttribute
Copts bazel.StringListAttribute Copts bazel.StringListAttribute
Local_include_dirs []string Local_include_dirs []string
} }
@@ -147,14 +147,16 @@ func ObjectBp2Build(ctx android.TopDownMutatorContext) {
// Set arch-specific configurable attributes // Set arch-specific configurable attributes
var copts bazel.StringListAttribute var copts bazel.StringListAttribute
var srcs []string var srcs bazel.LabelListAttribute
var excludeSrcs []string
var localIncludeDirs []string var localIncludeDirs []string
for _, props := range m.compiler.compilerProps() { for _, props := range m.compiler.compilerProps() {
if baseCompilerProps, ok := props.(*BaseCompilerProperties); ok { if baseCompilerProps, ok := props.(*BaseCompilerProperties); ok {
copts.Value = baseCompilerProps.Cflags copts.Value = baseCompilerProps.Cflags
srcs = baseCompilerProps.Srcs srcs = bazel.MakeLabelListAttribute(
excludeSrcs = baseCompilerProps.Exclude_srcs android.BazelLabelForModuleSrcExcludes(
ctx,
baseCompilerProps.Srcs,
baseCompilerProps.Exclude_srcs))
localIncludeDirs = baseCompilerProps.Local_include_dirs localIncludeDirs = baseCompilerProps.Local_include_dirs
break break
} }
@@ -164,22 +166,23 @@ func ObjectBp2Build(ctx android.TopDownMutatorContext) {
localIncludeDirs = append(localIncludeDirs, ".") localIncludeDirs = append(localIncludeDirs, ".")
} }
var deps bazel.LabelList var deps bazel.LabelListAttribute
for _, props := range m.linker.linkerProps() { for _, props := range m.linker.linkerProps() {
if objectLinkerProps, ok := props.(*ObjectLinkerProperties); ok { if objectLinkerProps, ok := props.(*ObjectLinkerProperties); ok {
deps = android.BazelLabelForModuleDeps(ctx, objectLinkerProps.Objs) deps = bazel.MakeLabelListAttribute(
android.BazelLabelForModuleDeps(ctx, objectLinkerProps.Objs))
} }
} }
for arch, p := range m.GetArchProperties(&BaseCompilerProperties{}) { for arch, p := range m.GetArchProperties(&BaseCompilerProperties{}) {
if cProps, ok := p.(*BaseCompilerProperties); ok { if cProps, ok := p.(*BaseCompilerProperties); ok {
srcs.SetValueForArch(arch.Name, android.BazelLabelForModuleSrcExcludes(ctx, cProps.Srcs, cProps.Exclude_srcs))
copts.SetValueForArch(arch.Name, cProps.Cflags) copts.SetValueForArch(arch.Name, cProps.Cflags)
} }
} }
copts.SetValueForArch("default", []string{})
attrs := &bazelObjectAttributes{ attrs := &bazelObjectAttributes{
Srcs: android.BazelLabelForModuleSrcExcludes(ctx, srcs, excludeSrcs), Srcs: srcs,
Deps: deps, Deps: deps,
Copts: copts, Copts: copts,
Local_include_dirs: localIncludeDirs, Local_include_dirs: localIncludeDirs,

23
genrule/genrule.go
View File

@@ -798,9 +798,9 @@ type genRuleProperties struct {
} }
type bazelGenruleAttributes struct { type bazelGenruleAttributes struct {
Srcs bazel.LabelList Srcs bazel.LabelListAttribute
Outs []string Outs []string
Tools bazel.LabelList Tools bazel.LabelListAttribute
Cmd string Cmd string
} }
@@ -828,15 +828,16 @@ func GenruleBp2Build(ctx android.TopDownMutatorContext) {
} }
// Bazel only has the "tools" attribute. // Bazel only has the "tools" attribute.
tools := android.BazelLabelForModuleDeps(ctx, m.properties.Tools) tools_prop := android.BazelLabelForModuleDeps(ctx, m.properties.Tools)
tool_files := android.BazelLabelForModuleSrc(ctx, m.properties.Tool_files) tool_files_prop := android.BazelLabelForModuleSrc(ctx, m.properties.Tool_files)
tools.Append(tool_files) tools_prop.Append(tool_files_prop)
srcs := android.BazelLabelForModuleSrc(ctx, m.properties.Srcs) tools := bazel.MakeLabelListAttribute(tools_prop)
srcs := bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, m.properties.Srcs))
var allReplacements bazel.LabelList var allReplacements bazel.LabelList
allReplacements.Append(tools) allReplacements.Append(tools.Value)
allReplacements.Append(srcs) allReplacements.Append(srcs.Value)
// Replace in and out variables with $< and $@ // Replace in and out variables with $< and $@
var cmd string var cmd string
@@ -844,9 +845,9 @@ func GenruleBp2Build(ctx android.TopDownMutatorContext) {
cmd = strings.Replace(*m.properties.Cmd, "$(in)", "$(SRCS)", -1) cmd = strings.Replace(*m.properties.Cmd, "$(in)", "$(SRCS)", -1)
cmd = strings.Replace(cmd, "$(out)", "$(OUTS)", -1) cmd = strings.Replace(cmd, "$(out)", "$(OUTS)", -1)
cmd = strings.Replace(cmd, "$(genDir)", "$(GENDIR)", -1) cmd = strings.Replace(cmd, "$(genDir)", "$(GENDIR)", -1)
if len(tools.Includes) > 0 { if len(tools.Value.Includes) > 0 {
cmd = strings.Replace(cmd, "$(location)", fmt.Sprintf("$(location %s)", tools.Includes[0].Label), -1) cmd = strings.Replace(cmd, "$(location)", fmt.Sprintf("$(location %s)", tools.Value.Includes[0].Label), -1)
cmd = strings.Replace(cmd, "$(locations)", fmt.Sprintf("$(locations %s)", tools.Includes[0].Label), -1) cmd = strings.Replace(cmd, "$(locations)", fmt.Sprintf("$(locations %s)", tools.Value.Includes[0].Label), -1)
} }
for _, l := range allReplacements.Includes { for _, l := range allReplacements.Includes {
bpLoc := fmt.Sprintf("$(location %s)", l.Bp_text) bpLoc := fmt.Sprintf("$(location %s)", l.Bp_text)

11
python/binary.go
View File

@@ -36,8 +36,8 @@ func registerPythonBinaryComponents(ctx android.RegistrationContext) {
type bazelPythonBinaryAttributes struct { type bazelPythonBinaryAttributes struct {
Main string Main string
Srcs bazel.LabelList Srcs bazel.LabelListAttribute
Data bazel.LabelList Data bazel.LabelListAttribute
Python_version string Python_version string
} }
@@ -97,10 +97,13 @@ func PythonBinaryBp2Build(ctx android.TopDownMutatorContext) {
// do nothing, since python_version defaults to PY3. // do nothing, since python_version defaults to PY3.
} }
srcs := android.BazelLabelForModuleSrcExcludes(ctx, m.properties.Srcs, m.properties.Exclude_srcs)
data := android.BazelLabelForModuleSrc(ctx, m.properties.Data)
attrs := &bazelPythonBinaryAttributes{ attrs := &bazelPythonBinaryAttributes{
Main: main, Main: main,
Srcs: android.BazelLabelForModuleSrcExcludes(ctx, m.properties.Srcs, m.properties.Exclude_srcs), Srcs: bazel.MakeLabelListAttribute(srcs),
Data: android.BazelLabelForModuleSrc(ctx, m.properties.Data), Data: bazel.MakeLabelListAttribute(data),
Python_version: python_version, Python_version: python_version,
} }

5
sh/sh_binary.go
View File

@@ -485,7 +485,7 @@ func ShTestHostFactory() android.Module {
} }
type bazelShBinaryAttributes struct { type bazelShBinaryAttributes struct {
Srcs bazel.LabelList Srcs bazel.LabelListAttribute
// Bazel also supports the attributes below, but (so far) these are not required for Bionic // Bazel also supports the attributes below, but (so far) these are not required for Bionic
// deps // deps
// data // data
@@ -525,7 +525,8 @@ func ShBinaryBp2Build(ctx android.TopDownMutatorContext) {
return return
} }
srcs := android.BazelLabelForModuleSrc(ctx, []string{*m.properties.Src}) srcs := bazel.MakeLabelListAttribute(
android.BazelLabelForModuleSrc(ctx, []string{*m.properties.Src}))
attrs := &bazelShBinaryAttributes{ attrs := &bazelShBinaryAttributes{
Srcs: srcs, Srcs: srcs,