2020-11-19 11:38:02 +01:00
|
|
|
// Copyright 2020 Google Inc. All rights reserved.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package bazel
|
|
|
|
|
2021-03-12 12:04:21 +01:00
|
|
|
import (
|
|
|
|
"fmt"
|
2021-03-24 15:04:33 +01:00
|
|
|
"path/filepath"
|
2021-03-24 15:14:47 +01:00
|
|
|
"regexp"
|
2021-03-12 12:04:21 +01:00
|
|
|
"sort"
|
|
|
|
)
|
2021-02-24 13:20:12 +01:00
|
|
|
|
2020-12-14 14:25:34 +01:00
|
|
|
// BazelTargetModuleProperties contain properties and metadata used for
|
|
|
|
// Blueprint to BUILD file conversion.
|
|
|
|
type BazelTargetModuleProperties struct {
|
|
|
|
// The Bazel rule class for this target.
|
2021-02-19 17:06:17 +01:00
|
|
|
Rule_class string `blueprint:"mutated"`
|
2021-01-27 03:58:43 +01:00
|
|
|
|
|
|
|
// The target label for the bzl file containing the definition of the rule class.
|
2021-02-19 17:06:17 +01:00
|
|
|
Bzl_load_location string `blueprint:"mutated"`
|
2020-12-14 14:25:34 +01:00
|
|
|
}
|
2021-01-26 15:18:53 +01:00
|
|
|
|
2021-02-07 16:05:16 +01:00
|
|
|
const BazelTargetModuleNamePrefix = "__bp2build__"
|
|
|
|
|
2021-03-24 15:14:47 +01:00
|
|
|
var productVariableSubstitutionPattern = regexp.MustCompile("%(d|s)")
|
|
|
|
|
2021-04-19 07:00:15 +02:00
|
|
|
// Label is used to represent a Bazel compatible Label. Also stores the original
|
|
|
|
// bp text to support string replacement.
|
2021-01-26 15:18:53 +01:00
|
|
|
type Label struct {
|
2021-04-19 07:00:15 +02:00
|
|
|
// The string representation of a Bazel target label. This can be a relative
|
|
|
|
// or fully qualified label. These labels are used for generating BUILD
|
|
|
|
// files with bp2build.
|
|
|
|
Label string
|
|
|
|
|
|
|
|
// The original Soong/Blueprint module name that the label was derived from.
|
|
|
|
// This is used for replacing references to the original name with the new
|
|
|
|
// label, for example in genrule cmds.
|
|
|
|
//
|
|
|
|
// While there is a reversible 1:1 mapping from the module name to Bazel
|
|
|
|
// label with bp2build that could make computing the original module name
|
|
|
|
// from the label automatic, it is not the case for handcrafted targets,
|
|
|
|
// where modules can have a custom label mapping through the { bazel_module:
|
|
|
|
// { label: <label> } } property.
|
|
|
|
//
|
|
|
|
// With handcrafted labels, those modules don't go through bp2build
|
|
|
|
// conversion, but relies on handcrafted targets in the source tree.
|
|
|
|
OriginalModuleName string
|
2021-01-26 15:18:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// LabelList is used to represent a list of Bazel labels.
|
|
|
|
type LabelList struct {
|
|
|
|
Includes []Label
|
|
|
|
Excludes []Label
|
|
|
|
}
|
|
|
|
|
2021-03-24 15:04:33 +01:00
|
|
|
// uniqueParentDirectories returns a list of the unique parent directories for
|
|
|
|
// all files in ll.Includes.
|
|
|
|
func (ll *LabelList) uniqueParentDirectories() []string {
|
|
|
|
dirMap := map[string]bool{}
|
|
|
|
for _, label := range ll.Includes {
|
|
|
|
dirMap[filepath.Dir(label.Label)] = true
|
|
|
|
}
|
|
|
|
dirs := []string{}
|
|
|
|
for dir := range dirMap {
|
|
|
|
dirs = append(dirs, dir)
|
|
|
|
}
|
|
|
|
return dirs
|
|
|
|
}
|
|
|
|
|
2021-01-26 15:18:53 +01:00
|
|
|
// Append appends the fields of other labelList to the corresponding fields of ll.
|
|
|
|
func (ll *LabelList) Append(other LabelList) {
|
|
|
|
if len(ll.Includes) > 0 || len(other.Includes) > 0 {
|
|
|
|
ll.Includes = append(ll.Includes, other.Includes...)
|
|
|
|
}
|
|
|
|
if len(ll.Excludes) > 0 || len(other.Excludes) > 0 {
|
|
|
|
ll.Excludes = append(other.Excludes, other.Excludes...)
|
|
|
|
}
|
|
|
|
}
|
2021-02-24 13:20:12 +01:00
|
|
|
|
2021-04-13 09:14:55 +02:00
|
|
|
// UniqueSortedBazelLabels takes a []Label and deduplicates the labels, and returns
|
|
|
|
// the slice in a sorted order.
|
|
|
|
func UniqueSortedBazelLabels(originalLabels []Label) []Label {
|
2021-03-12 12:04:21 +01:00
|
|
|
uniqueLabelsSet := make(map[Label]bool)
|
|
|
|
for _, l := range originalLabels {
|
|
|
|
uniqueLabelsSet[l] = true
|
|
|
|
}
|
|
|
|
var uniqueLabels []Label
|
|
|
|
for l, _ := range uniqueLabelsSet {
|
|
|
|
uniqueLabels = append(uniqueLabels, l)
|
|
|
|
}
|
|
|
|
sort.SliceStable(uniqueLabels, func(i, j int) bool {
|
|
|
|
return uniqueLabels[i].Label < uniqueLabels[j].Label
|
|
|
|
})
|
|
|
|
return uniqueLabels
|
|
|
|
}
|
|
|
|
|
|
|
|
func UniqueBazelLabelList(originalLabelList LabelList) LabelList {
|
|
|
|
var uniqueLabelList LabelList
|
2021-04-13 09:14:55 +02:00
|
|
|
uniqueLabelList.Includes = UniqueSortedBazelLabels(originalLabelList.Includes)
|
|
|
|
uniqueLabelList.Excludes = UniqueSortedBazelLabels(originalLabelList.Excludes)
|
2021-03-12 12:04:21 +01:00
|
|
|
return uniqueLabelList
|
|
|
|
}
|
|
|
|
|
2021-04-06 22:06:21 +02:00
|
|
|
// Subtract needle from haystack
|
|
|
|
func SubtractStrings(haystack []string, needle []string) []string {
|
|
|
|
// This is really a set
|
|
|
|
remainder := make(map[string]bool)
|
|
|
|
|
|
|
|
for _, s := range haystack {
|
|
|
|
remainder[s] = true
|
|
|
|
}
|
|
|
|
for _, s := range needle {
|
|
|
|
delete(remainder, s)
|
|
|
|
}
|
|
|
|
|
|
|
|
var strings []string
|
|
|
|
for s, _ := range remainder {
|
|
|
|
strings = append(strings, s)
|
|
|
|
}
|
|
|
|
|
|
|
|
sort.SliceStable(strings, func(i, j int) bool {
|
|
|
|
return strings[i] < strings[j]
|
|
|
|
})
|
|
|
|
|
|
|
|
return strings
|
|
|
|
}
|
|
|
|
|
|
|
|
// Subtract needle from haystack
|
|
|
|
func SubtractBazelLabels(haystack []Label, needle []Label) []Label {
|
|
|
|
// This is really a set
|
|
|
|
remainder := make(map[Label]bool)
|
|
|
|
|
|
|
|
for _, label := range haystack {
|
|
|
|
remainder[label] = true
|
|
|
|
}
|
|
|
|
for _, label := range needle {
|
|
|
|
delete(remainder, label)
|
|
|
|
}
|
|
|
|
|
|
|
|
var labels []Label
|
|
|
|
for label, _ := range remainder {
|
|
|
|
labels = append(labels, label)
|
|
|
|
}
|
|
|
|
|
|
|
|
sort.SliceStable(labels, func(i, j int) bool {
|
|
|
|
return labels[i].Label < labels[j].Label
|
|
|
|
})
|
|
|
|
|
|
|
|
return labels
|
|
|
|
}
|
|
|
|
|
|
|
|
// Subtract needle from haystack
|
|
|
|
func SubtractBazelLabelList(haystack LabelList, needle LabelList) LabelList {
|
|
|
|
var result LabelList
|
|
|
|
result.Includes = SubtractBazelLabels(haystack.Includes, needle.Includes)
|
|
|
|
// NOTE: Excludes are intentionally not subtracted
|
|
|
|
result.Excludes = haystack.Excludes
|
|
|
|
return result
|
|
|
|
}
|
|
|
|
|
2021-03-15 11:02:43 +01:00
|
|
|
const (
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
// ArchType names in arch.go
|
2021-03-15 11:02:43 +01:00
|
|
|
ARCH_ARM = "arm"
|
|
|
|
ARCH_ARM64 = "arm64"
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
ARCH_X86 = "x86"
|
|
|
|
ARCH_X86_64 = "x86_64"
|
|
|
|
|
|
|
|
// OsType names in arch.go
|
|
|
|
OS_ANDROID = "android"
|
|
|
|
OS_DARWIN = "darwin"
|
|
|
|
OS_FUCHSIA = "fuchsia"
|
|
|
|
OS_LINUX = "linux_glibc"
|
|
|
|
OS_LINUX_BIONIC = "linux_bionic"
|
|
|
|
OS_WINDOWS = "windows"
|
2021-04-23 11:17:24 +02:00
|
|
|
|
|
|
|
// This is the string representation of the default condition wherever a
|
|
|
|
// configurable attribute is used in a select statement, i.e.
|
|
|
|
// //conditions:default for Bazel.
|
|
|
|
//
|
|
|
|
// This is consistently named "conditions_default" to mirror the Soong
|
|
|
|
// config variable default key in an Android.bp file, although there's no
|
|
|
|
// integration with Soong config variables (yet).
|
|
|
|
CONDITIONS_DEFAULT = "conditions_default"
|
2021-03-15 11:02:43 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
2021-04-05 12:35:13 +02:00
|
|
|
// These are the list of OSes and architectures with a Bazel config_setting
|
|
|
|
// and constraint value equivalent. These exist in arch.go, but the android
|
|
|
|
// package depends on the bazel package, so a cyclic dependency prevents
|
|
|
|
// using those variables here.
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
|
|
|
|
// A map of architectures to the Bazel label of the constraint_value
|
|
|
|
// for the @platforms//cpu:cpu constraint_setting
|
|
|
|
PlatformArchMap = map[string]string{
|
2021-04-23 11:17:24 +02:00
|
|
|
ARCH_ARM: "//build/bazel/platforms/arch:arm",
|
|
|
|
ARCH_ARM64: "//build/bazel/platforms/arch:arm64",
|
|
|
|
ARCH_X86: "//build/bazel/platforms/arch:x86",
|
|
|
|
ARCH_X86_64: "//build/bazel/platforms/arch:x86_64",
|
|
|
|
CONDITIONS_DEFAULT: "//conditions:default", // The default condition of as arch select map.
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// A map of target operating systems to the Bazel label of the
|
|
|
|
// constraint_value for the @platforms//os:os constraint_setting
|
|
|
|
PlatformOsMap = map[string]string{
|
2021-04-23 11:17:24 +02:00
|
|
|
OS_ANDROID: "//build/bazel/platforms/os:android",
|
|
|
|
OS_DARWIN: "//build/bazel/platforms/os:darwin",
|
|
|
|
OS_FUCHSIA: "//build/bazel/platforms/os:fuchsia",
|
|
|
|
OS_LINUX: "//build/bazel/platforms/os:linux",
|
|
|
|
OS_LINUX_BIONIC: "//build/bazel/platforms/os:linux_bionic",
|
|
|
|
OS_WINDOWS: "//build/bazel/platforms/os:windows",
|
|
|
|
CONDITIONS_DEFAULT: "//conditions:default", // The default condition of an os select map.
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
}
|
2021-03-15 11:02:43 +01:00
|
|
|
)
|
|
|
|
|
2021-04-05 12:35:13 +02:00
|
|
|
type Attribute interface {
|
|
|
|
HasConfigurableValues() bool
|
|
|
|
}
|
|
|
|
|
2021-04-30 15:35:09 +02:00
|
|
|
// Represents an attribute whose value is a single label
|
|
|
|
type LabelAttribute struct {
|
2021-05-05 09:00:01 +02:00
|
|
|
Value Label
|
|
|
|
X86 Label
|
|
|
|
X86_64 Label
|
|
|
|
Arm Label
|
|
|
|
Arm64 Label
|
2021-04-30 15:35:09 +02:00
|
|
|
}
|
|
|
|
|
2021-05-05 09:00:01 +02:00
|
|
|
func (attr *LabelAttribute) GetValueForArch(arch string) Label {
|
|
|
|
switch arch {
|
|
|
|
case ARCH_ARM:
|
|
|
|
return attr.Arm
|
|
|
|
case ARCH_ARM64:
|
|
|
|
return attr.Arm64
|
|
|
|
case ARCH_X86:
|
|
|
|
return attr.X86
|
|
|
|
case ARCH_X86_64:
|
|
|
|
return attr.X86_64
|
|
|
|
case CONDITIONS_DEFAULT:
|
|
|
|
return attr.Value
|
|
|
|
default:
|
|
|
|
panic("Invalid arch type")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (attr *LabelAttribute) SetValueForArch(arch string, value Label) {
|
|
|
|
switch arch {
|
|
|
|
case ARCH_ARM:
|
|
|
|
attr.Arm = value
|
|
|
|
case ARCH_ARM64:
|
|
|
|
attr.Arm64 = value
|
|
|
|
case ARCH_X86:
|
|
|
|
attr.X86 = value
|
|
|
|
case ARCH_X86_64:
|
|
|
|
attr.X86_64 = value
|
|
|
|
default:
|
|
|
|
panic("Invalid arch type")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (attr LabelAttribute) HasConfigurableValues() bool {
|
|
|
|
return attr.Arm.Label != "" || attr.Arm64.Label != "" || attr.X86.Label != "" || attr.X86_64.Label != ""
|
2021-04-30 15:35:09 +02:00
|
|
|
}
|
|
|
|
|
2021-03-15 11:02:43 +01:00
|
|
|
// 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
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
Common LabelList
|
2021-04-23 11:17:24 +02:00
|
|
|
|
|
|
|
ConditionsDefault LabelList
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type labelListOsValues struct {
|
|
|
|
Android LabelList
|
|
|
|
Darwin LabelList
|
|
|
|
Fuchsia LabelList
|
|
|
|
Linux LabelList
|
|
|
|
LinuxBionic LabelList
|
|
|
|
Windows LabelList
|
2021-04-23 11:17:24 +02:00
|
|
|
|
|
|
|
ConditionsDefault LabelList
|
2021-03-15 11:02:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// 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
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
|
|
|
|
// The os-specific attribute label list values. Optional. If used, these
|
|
|
|
// are generated in a select statement and appended to the non-os specific
|
|
|
|
// label list Value.
|
|
|
|
OsValues labelListOsValues
|
2021-03-15 11:02:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// MakeLabelListAttribute initializes a LabelListAttribute with the non-arch specific value.
|
|
|
|
func MakeLabelListAttribute(value LabelList) LabelListAttribute {
|
|
|
|
return LabelListAttribute{Value: UniqueBazelLabelList(value)}
|
|
|
|
}
|
|
|
|
|
2021-04-13 09:14:55 +02:00
|
|
|
// Append all values, including os and arch specific ones, from another
|
2021-03-24 15:04:33 +01:00
|
|
|
// LabelListAttribute to this LabelListAttribute.
|
|
|
|
func (attrs *LabelListAttribute) Append(other LabelListAttribute) {
|
|
|
|
for arch := range PlatformArchMap {
|
|
|
|
this := attrs.GetValueForArch(arch)
|
|
|
|
that := other.GetValueForArch(arch)
|
|
|
|
this.Append(that)
|
|
|
|
attrs.SetValueForArch(arch, this)
|
|
|
|
}
|
|
|
|
|
|
|
|
for os := range PlatformOsMap {
|
|
|
|
this := attrs.GetValueForOS(os)
|
|
|
|
that := other.GetValueForOS(os)
|
|
|
|
this.Append(that)
|
|
|
|
attrs.SetValueForOS(os, this)
|
|
|
|
}
|
|
|
|
|
|
|
|
attrs.Value.Append(other.Value)
|
|
|
|
}
|
|
|
|
|
2021-03-15 11:02:43 +01:00
|
|
|
// HasArchSpecificValues returns true if the attribute contains
|
|
|
|
// architecture-specific label_list values.
|
2021-04-05 12:35:13 +02:00
|
|
|
func (attrs LabelListAttribute) HasConfigurableValues() bool {
|
|
|
|
for arch := range PlatformArchMap {
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
if len(attrs.GetValueForArch(arch).Includes) > 0 {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-04-05 12:35:13 +02:00
|
|
|
for os := range PlatformOsMap {
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
if len(attrs.GetValueForOS(os).Includes) > 0 {
|
2021-03-15 11:02:43 +01:00
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
func (attrs *LabelListAttribute) archValuePtrs() map[string]*LabelList {
|
|
|
|
return map[string]*LabelList{
|
2021-04-23 11:17:24 +02:00
|
|
|
ARCH_X86: &attrs.ArchValues.X86,
|
|
|
|
ARCH_X86_64: &attrs.ArchValues.X86_64,
|
|
|
|
ARCH_ARM: &attrs.ArchValues.Arm,
|
|
|
|
ARCH_ARM64: &attrs.ArchValues.Arm64,
|
|
|
|
CONDITIONS_DEFAULT: &attrs.ArchValues.ConditionsDefault,
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-15 11:02:43 +01:00
|
|
|
// GetValueForArch returns the label_list attribute value for an architecture.
|
|
|
|
func (attrs *LabelListAttribute) GetValueForArch(arch string) LabelList {
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
var v *LabelList
|
|
|
|
if v = attrs.archValuePtrs()[arch]; v == nil {
|
2021-03-15 11:02:43 +01:00
|
|
|
panic(fmt.Errorf("Unknown arch: %s", arch))
|
|
|
|
}
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
return *v
|
2021-03-15 11:02:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// SetValueForArch sets the label_list attribute value for an architecture.
|
|
|
|
func (attrs *LabelListAttribute) SetValueForArch(arch string, value LabelList) {
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
var v *LabelList
|
|
|
|
if v = attrs.archValuePtrs()[arch]; v == nil {
|
2021-03-15 11:02:43 +01:00
|
|
|
panic(fmt.Errorf("Unknown arch: %s", arch))
|
|
|
|
}
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
*v = value
|
|
|
|
}
|
|
|
|
|
|
|
|
func (attrs *LabelListAttribute) osValuePtrs() map[string]*LabelList {
|
|
|
|
return map[string]*LabelList{
|
2021-04-23 11:17:24 +02:00
|
|
|
OS_ANDROID: &attrs.OsValues.Android,
|
|
|
|
OS_DARWIN: &attrs.OsValues.Darwin,
|
|
|
|
OS_FUCHSIA: &attrs.OsValues.Fuchsia,
|
|
|
|
OS_LINUX: &attrs.OsValues.Linux,
|
|
|
|
OS_LINUX_BIONIC: &attrs.OsValues.LinuxBionic,
|
|
|
|
OS_WINDOWS: &attrs.OsValues.Windows,
|
|
|
|
CONDITIONS_DEFAULT: &attrs.OsValues.ConditionsDefault,
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetValueForOS returns the label_list attribute value for an OS target.
|
|
|
|
func (attrs *LabelListAttribute) GetValueForOS(os string) LabelList {
|
|
|
|
var v *LabelList
|
|
|
|
if v = attrs.osValuePtrs()[os]; v == nil {
|
|
|
|
panic(fmt.Errorf("Unknown os: %s", os))
|
|
|
|
}
|
|
|
|
return *v
|
|
|
|
}
|
|
|
|
|
|
|
|
// SetValueForArch sets the label_list attribute value for an OS target.
|
|
|
|
func (attrs *LabelListAttribute) SetValueForOS(os string, value LabelList) {
|
|
|
|
var v *LabelList
|
|
|
|
if v = attrs.osValuePtrs()[os]; v == nil {
|
|
|
|
panic(fmt.Errorf("Unknown os: %s", os))
|
|
|
|
}
|
|
|
|
*v = value
|
2021-03-15 11:02:43 +01:00
|
|
|
}
|
|
|
|
|
2021-02-24 13:20:12 +01:00
|
|
|
// StringListAttribute corresponds to the string_list Bazel attribute type with
|
|
|
|
// support for additional metadata, like configurations.
|
|
|
|
type StringListAttribute struct {
|
|
|
|
// The base value of the string list attribute.
|
|
|
|
Value []string
|
|
|
|
|
2021-04-05 12:35:13 +02:00
|
|
|
// The arch-specific attribute string list values. Optional. If used, these
|
|
|
|
// are generated in a select statement and appended to the non-arch specific
|
|
|
|
// label list Value.
|
2021-02-24 13:20:12 +01:00
|
|
|
ArchValues stringListArchValues
|
2021-04-05 12:35:13 +02:00
|
|
|
|
|
|
|
// The os-specific attribute string list values. Optional. If used, these
|
|
|
|
// are generated in a select statement and appended to the non-os specific
|
|
|
|
// label list Value.
|
|
|
|
OsValues stringListOsValues
|
2021-02-24 13:20:12 +01:00
|
|
|
}
|
|
|
|
|
2021-04-06 22:06:21 +02:00
|
|
|
// MakeStringListAttribute initializes a StringListAttribute with the non-arch specific value.
|
|
|
|
func MakeStringListAttribute(value []string) StringListAttribute {
|
|
|
|
// NOTE: These strings are not necessarily unique or sorted.
|
|
|
|
return StringListAttribute{Value: value}
|
|
|
|
}
|
|
|
|
|
2021-02-24 13:20:12 +01:00
|
|
|
// Arch-specific string_list typed Bazel attribute values. This should correspond
|
|
|
|
// to the types of architectures supported for compilation in arch.go.
|
|
|
|
type stringListArchValues struct {
|
2021-03-15 11:02:43 +01:00
|
|
|
X86 []string
|
|
|
|
X86_64 []string
|
|
|
|
Arm []string
|
|
|
|
Arm64 []string
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
Common []string
|
2021-04-23 11:17:24 +02:00
|
|
|
|
|
|
|
ConditionsDefault []string
|
2021-02-24 13:20:12 +01:00
|
|
|
}
|
|
|
|
|
2021-04-05 12:35:13 +02:00
|
|
|
type stringListOsValues struct {
|
|
|
|
Android []string
|
|
|
|
Darwin []string
|
|
|
|
Fuchsia []string
|
|
|
|
Linux []string
|
|
|
|
LinuxBionic []string
|
|
|
|
Windows []string
|
2021-04-23 11:17:24 +02:00
|
|
|
|
|
|
|
ConditionsDefault []string
|
2021-04-05 12:35:13 +02:00
|
|
|
}
|
|
|
|
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
// HasConfigurableValues returns true if the attribute contains
|
2021-02-24 13:20:12 +01:00
|
|
|
// architecture-specific string_list values.
|
2021-04-05 12:35:13 +02:00
|
|
|
func (attrs StringListAttribute) HasConfigurableValues() bool {
|
|
|
|
for arch := range PlatformArchMap {
|
2021-02-24 13:20:12 +01:00
|
|
|
if len(attrs.GetValueForArch(arch)) > 0 {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
2021-04-05 12:35:13 +02:00
|
|
|
|
|
|
|
for os := range PlatformOsMap {
|
|
|
|
if len(attrs.GetValueForOS(os)) > 0 {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
2021-02-24 13:20:12 +01:00
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
func (attrs *StringListAttribute) archValuePtrs() map[string]*[]string {
|
|
|
|
return map[string]*[]string{
|
2021-04-23 11:17:24 +02:00
|
|
|
ARCH_X86: &attrs.ArchValues.X86,
|
|
|
|
ARCH_X86_64: &attrs.ArchValues.X86_64,
|
|
|
|
ARCH_ARM: &attrs.ArchValues.Arm,
|
|
|
|
ARCH_ARM64: &attrs.ArchValues.Arm64,
|
|
|
|
CONDITIONS_DEFAULT: &attrs.ArchValues.ConditionsDefault,
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-02-24 13:20:12 +01:00
|
|
|
// GetValueForArch returns the string_list attribute value for an architecture.
|
|
|
|
func (attrs *StringListAttribute) GetValueForArch(arch string) []string {
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
var v *[]string
|
|
|
|
if v = attrs.archValuePtrs()[arch]; v == nil {
|
2021-02-24 13:20:12 +01:00
|
|
|
panic(fmt.Errorf("Unknown arch: %s", arch))
|
|
|
|
}
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
return *v
|
2021-02-24 13:20:12 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// SetValueForArch sets the string_list attribute value for an architecture.
|
|
|
|
func (attrs *StringListAttribute) SetValueForArch(arch string, value []string) {
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
var v *[]string
|
|
|
|
if v = attrs.archValuePtrs()[arch]; v == nil {
|
2021-02-24 13:20:12 +01:00
|
|
|
panic(fmt.Errorf("Unknown arch: %s", arch))
|
|
|
|
}
|
Add os/target configurable selects for label list attributes.
This CL is pretty large, so I recommend starting with reading the newly
added tests for the expected behavior.
This change works in conjunction with the linked CLs in the Gerrit topic.
Those CLs add support for new platform() definitions for OS targets
specified in Soong's arch.go, which are configurable through
Android.bp's `target {}` property. It works similary to previous CLs
adding support for the `arch {}` property.
These configurable props are keyed by the OS: android, linux_bionic,
windows, and so on. They map to `select` statements in label list
attributes, which this CL enables for cc_library_headers' header_libs
and export_header_lib_headers props.
This enables //bionic/libc:libc_headers to be generated correctly, from:
cc_library_headers {
name: "libc_headers",
target: {
android: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
linux_bionic: {
header_libs: ["libc_headers_arch"],
export_header_lib_headers: ["libc_headers_arch"],
},
},
// omitted props
}
to:
cc_library_headers(
name = "libc_headers",
deps = [] + select({
"//build/bazel/platforms/os:android": [
":libc_headers_arch",
],
"//build/bazel/platforms/os:linux_bionic": [
":libc_headers_arch",
],
"//conditions:default": [],
}),
)
Test: TH
Test: Verify generated //bionic/libc:libc_headers
Fixes: 183597786
Change-Id: I01016cc2cc9a71449f02300d747f01decebf3f6e
2021-03-24 07:18:33 +01:00
|
|
|
*v = value
|
2021-02-24 13:20:12 +01:00
|
|
|
}
|
2021-03-24 15:14:47 +01:00
|
|
|
|
2021-04-05 12:35:13 +02:00
|
|
|
func (attrs *StringListAttribute) osValuePtrs() map[string]*[]string {
|
|
|
|
return map[string]*[]string{
|
2021-04-23 11:17:24 +02:00
|
|
|
OS_ANDROID: &attrs.OsValues.Android,
|
|
|
|
OS_DARWIN: &attrs.OsValues.Darwin,
|
|
|
|
OS_FUCHSIA: &attrs.OsValues.Fuchsia,
|
|
|
|
OS_LINUX: &attrs.OsValues.Linux,
|
|
|
|
OS_LINUX_BIONIC: &attrs.OsValues.LinuxBionic,
|
|
|
|
OS_WINDOWS: &attrs.OsValues.Windows,
|
|
|
|
CONDITIONS_DEFAULT: &attrs.OsValues.ConditionsDefault,
|
2021-04-05 12:35:13 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetValueForOS returns the string_list attribute value for an OS target.
|
|
|
|
func (attrs *StringListAttribute) GetValueForOS(os string) []string {
|
|
|
|
var v *[]string
|
|
|
|
if v = attrs.osValuePtrs()[os]; v == nil {
|
|
|
|
panic(fmt.Errorf("Unknown os: %s", os))
|
|
|
|
}
|
|
|
|
return *v
|
|
|
|
}
|
|
|
|
|
|
|
|
// SetValueForArch sets the string_list attribute value for an OS target.
|
|
|
|
func (attrs *StringListAttribute) SetValueForOS(os string, value []string) {
|
|
|
|
var v *[]string
|
|
|
|
if v = attrs.osValuePtrs()[os]; v == nil {
|
|
|
|
panic(fmt.Errorf("Unknown os: %s", os))
|
|
|
|
}
|
|
|
|
*v = value
|
|
|
|
}
|
|
|
|
|
2021-04-13 09:14:55 +02:00
|
|
|
// Append appends all values, including os and arch specific ones, from another
|
|
|
|
// StringListAttribute to this StringListAttribute
|
|
|
|
func (attrs *StringListAttribute) Append(other StringListAttribute) {
|
|
|
|
for arch := range PlatformArchMap {
|
|
|
|
this := attrs.GetValueForArch(arch)
|
|
|
|
that := other.GetValueForArch(arch)
|
|
|
|
this = append(this, that...)
|
|
|
|
attrs.SetValueForArch(arch, this)
|
|
|
|
}
|
|
|
|
|
|
|
|
for os := range PlatformOsMap {
|
|
|
|
this := attrs.GetValueForOS(os)
|
|
|
|
that := other.GetValueForOS(os)
|
|
|
|
this = append(this, that...)
|
|
|
|
attrs.SetValueForOS(os, this)
|
|
|
|
}
|
|
|
|
|
|
|
|
attrs.Value = append(attrs.Value, other.Value...)
|
|
|
|
}
|
|
|
|
|
2021-03-24 15:14:47 +01:00
|
|
|
// TryVariableSubstitution, replace string substitution formatting within each string in slice with
|
|
|
|
// Starlark string.format compatible tag for productVariable.
|
|
|
|
func TryVariableSubstitutions(slice []string, productVariable string) ([]string, bool) {
|
|
|
|
ret := make([]string, 0, len(slice))
|
|
|
|
changesMade := false
|
|
|
|
for _, s := range slice {
|
|
|
|
newS, changed := TryVariableSubstitution(s, productVariable)
|
|
|
|
ret = append(ret, newS)
|
|
|
|
changesMade = changesMade || changed
|
|
|
|
}
|
|
|
|
return ret, changesMade
|
|
|
|
}
|
|
|
|
|
|
|
|
// TryVariableSubstitution, replace string substitution formatting within s with Starlark
|
|
|
|
// string.format compatible tag for productVariable.
|
|
|
|
func TryVariableSubstitution(s string, productVariable string) (string, bool) {
|
|
|
|
sub := productVariableSubstitutionPattern.ReplaceAllString(s, "{"+productVariable+"}")
|
|
|
|
return sub, s != sub
|
|
|
|
}
|