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
|
|
|
// Copyright 2021 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 cc
|
|
|
|
|
|
|
|
import (
|
2021-04-13 09:14:55 +02:00
|
|
|
"path/filepath"
|
2021-05-12 06:33:00 +02:00
|
|
|
"strings"
|
2021-05-13 21:13:04 +02:00
|
|
|
|
|
|
|
"android/soong/android"
|
|
|
|
"android/soong/bazel"
|
2021-09-22 21:52:58 +02:00
|
|
|
|
2021-09-20 21:14:39 +02:00
|
|
|
"github.com/google/blueprint"
|
2021-05-26 14:45:30 +02:00
|
|
|
|
|
|
|
"github.com/google/blueprint/proptools"
|
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-05-24 21:41:47 +02:00
|
|
|
// staticOrSharedAttributes are the Bazel-ified versions of StaticOrSharedProperties --
|
2021-05-26 06:42:42 +02:00
|
|
|
// properties which apply to either the shared or static version of a cc_library module.
|
2021-05-24 21:41:47 +02:00
|
|
|
type staticOrSharedAttributes struct {
|
2021-06-11 14:51:48 +02:00
|
|
|
Srcs bazel.LabelListAttribute
|
|
|
|
Srcs_c bazel.LabelListAttribute
|
|
|
|
Srcs_as bazel.LabelListAttribute
|
|
|
|
Copts bazel.StringListAttribute
|
|
|
|
|
2021-09-22 21:52:58 +02:00
|
|
|
Deps bazel.LabelListAttribute
|
|
|
|
Implementation_deps bazel.LabelListAttribute
|
|
|
|
Dynamic_deps bazel.LabelListAttribute
|
|
|
|
Implementation_dynamic_deps bazel.LabelListAttribute
|
|
|
|
Whole_archive_deps bazel.LabelListAttribute
|
bp2build: handle system_shared_libs
- If no system_shared_libs is specified, bp2build writes no attribute
value. In this case, the bazel library macros determine the correct
default behavior.
- If any system_shared_libs is specified for any variant, then bp2build
writes the value verbatim. This includes if an empty list is specified,
as this should override defaulting behavior.
Note this defaulting behavior is incomplete and will be incorrect in
corner cases. For example, if, in an Android.bp, system_shared_libs is
specified for os.linux_bionic but not for os.android, then the bazel
default for os.android will be incorrect. However, there are no current
modules in AOSP which fit this case.
As a related fix, supports static struct for cc_library_static.
Also, removes some elements from the bp2build denylist.
Test: mixed_droid CI
Change-Id: Iee5feeaaf05e8e7209c7a90c913173832ad7bf91
2021-08-04 03:01:05 +02:00
|
|
|
|
|
|
|
System_dynamic_deps bazel.LabelListAttribute
|
2021-04-29 10:15:13 +02:00
|
|
|
}
|
|
|
|
|
2021-06-02 13:10:02 +02:00
|
|
|
func groupSrcsByExtension(ctx android.TopDownMutatorContext, srcs bazel.LabelListAttribute) (cppSrcs, cSrcs, asSrcs bazel.LabelListAttribute) {
|
|
|
|
// Check that a module is a filegroup type named <label>.
|
|
|
|
isFilegroupNamed := func(m android.Module, fullLabel string) bool {
|
|
|
|
if ctx.OtherModuleType(m) != "filegroup" {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
labelParts := strings.Split(fullLabel, ":")
|
|
|
|
if len(labelParts) > 2 {
|
|
|
|
// There should not be more than one colon in a label.
|
2021-09-20 18:55:02 +02:00
|
|
|
ctx.ModuleErrorf("%s is not a valid Bazel label for a filegroup", fullLabel)
|
2021-06-02 13:10:02 +02:00
|
|
|
}
|
2021-09-20 18:55:02 +02:00
|
|
|
return m.Name() == labelParts[len(labelParts)-1]
|
2021-06-02 13:10:02 +02:00
|
|
|
}
|
|
|
|
|
2021-09-20 18:55:02 +02:00
|
|
|
// Convert filegroup dependencies into extension-specific filegroups filtered in the filegroup.bzl
|
|
|
|
// macro.
|
|
|
|
addSuffixForFilegroup := func(suffix string) bazel.LabelMapper {
|
|
|
|
return func(ctx bazel.OtherModuleContext, label string) (string, bool) {
|
|
|
|
m, exists := ctx.ModuleFromName(label)
|
|
|
|
if !exists {
|
|
|
|
return label, false
|
2021-06-02 13:10:02 +02:00
|
|
|
}
|
2021-07-21 20:34:58 +02:00
|
|
|
aModule, _ := m.(android.Module)
|
2021-09-20 18:55:02 +02:00
|
|
|
if !isFilegroupNamed(aModule, label) {
|
|
|
|
return label, false
|
2021-06-02 13:10:02 +02:00
|
|
|
}
|
2021-09-20 18:55:02 +02:00
|
|
|
return label + suffix, true
|
2021-07-21 20:34:58 +02:00
|
|
|
}
|
2021-06-02 13:10:02 +02:00
|
|
|
}
|
|
|
|
|
2021-09-20 18:55:02 +02:00
|
|
|
// TODO(b/190006308): Handle language detection of sources in a Bazel rule.
|
|
|
|
partitioned := bazel.PartitionLabelListAttribute(ctx, &srcs, bazel.LabelPartitions{
|
|
|
|
"c": bazel.LabelPartition{Extensions: []string{".c"}, LabelMapper: addSuffixForFilegroup("_c_srcs")},
|
|
|
|
"as": bazel.LabelPartition{Extensions: []string{".s", ".S"}, LabelMapper: addSuffixForFilegroup("_as_srcs")},
|
|
|
|
// C++ is the "catch-all" group, and comprises generated sources because we don't
|
|
|
|
// know the language of these sources until the genrule is executed.
|
|
|
|
"cpp": bazel.LabelPartition{Extensions: []string{".cpp", ".cc", ".cxx", ".mm"}, LabelMapper: addSuffixForFilegroup("_cpp_srcs"), Keep_remainder: true},
|
|
|
|
})
|
2021-06-02 13:10:02 +02:00
|
|
|
|
2021-09-20 18:55:02 +02:00
|
|
|
cSrcs = partitioned["c"]
|
|
|
|
asSrcs = partitioned["as"]
|
|
|
|
cppSrcs = partitioned["cpp"]
|
2021-06-02 13:10:02 +02:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2021-09-01 23:22:09 +02:00
|
|
|
// bp2BuildParseLibProps returns the attributes for a variant of a cc_library.
|
|
|
|
func bp2BuildParseLibProps(ctx android.TopDownMutatorContext, module *Module, isStatic bool) staticOrSharedAttributes {
|
2021-04-29 10:15:13 +02:00
|
|
|
lib, ok := module.compiler.(*libraryDecorator)
|
|
|
|
if !ok {
|
2021-05-24 21:41:47 +02:00
|
|
|
return staticOrSharedAttributes{}
|
2021-04-29 10:15:13 +02:00
|
|
|
}
|
2021-09-01 23:22:09 +02:00
|
|
|
return bp2buildParseStaticOrSharedProps(ctx, module, lib, isStatic)
|
|
|
|
}
|
2021-04-29 10:15:13 +02:00
|
|
|
|
2021-09-01 23:22:09 +02:00
|
|
|
// bp2buildParseSharedProps returns the attributes for the shared variant of a cc_library.
|
|
|
|
func bp2BuildParseSharedProps(ctx android.TopDownMutatorContext, module *Module) staticOrSharedAttributes {
|
|
|
|
return bp2BuildParseLibProps(ctx, module, false)
|
2021-04-29 10:15:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// bp2buildParseStaticProps returns the attributes for the static variant of a cc_library.
|
2021-05-24 21:41:47 +02:00
|
|
|
func bp2BuildParseStaticProps(ctx android.TopDownMutatorContext, module *Module) staticOrSharedAttributes {
|
2021-09-01 23:22:09 +02:00
|
|
|
return bp2BuildParseLibProps(ctx, module, true)
|
2021-05-24 21:41:47 +02:00
|
|
|
}
|
|
|
|
|
2021-09-22 21:52:58 +02:00
|
|
|
type depsPartition struct {
|
|
|
|
export bazel.LabelList
|
|
|
|
implementation bazel.LabelList
|
|
|
|
}
|
|
|
|
|
|
|
|
type bazelLabelForDepsFn func(android.TopDownMutatorContext, []string) bazel.LabelList
|
|
|
|
|
|
|
|
func partitionExportedAndImplementationsDeps(ctx android.TopDownMutatorContext, allDeps, exportedDeps []string, fn bazelLabelForDepsFn) depsPartition {
|
|
|
|
implementation, export := android.FilterList(allDeps, exportedDeps)
|
|
|
|
|
|
|
|
return depsPartition{
|
|
|
|
export: fn(ctx, export),
|
|
|
|
implementation: fn(ctx, implementation),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type bazelLabelForDepsExcludesFn func(android.TopDownMutatorContext, []string, []string) bazel.LabelList
|
|
|
|
|
|
|
|
func partitionExportedAndImplementationsDepsExcludes(ctx android.TopDownMutatorContext, allDeps, excludes, exportedDeps []string, fn bazelLabelForDepsExcludesFn) depsPartition {
|
|
|
|
implementation, export := android.FilterList(allDeps, exportedDeps)
|
|
|
|
|
|
|
|
return depsPartition{
|
|
|
|
export: fn(ctx, export, excludes),
|
|
|
|
implementation: fn(ctx, implementation, excludes),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-05-26 06:42:42 +02:00
|
|
|
func bp2buildParseStaticOrSharedProps(ctx android.TopDownMutatorContext, module *Module, lib *libraryDecorator, isStatic bool) staticOrSharedAttributes {
|
2021-08-11 16:46:06 +02:00
|
|
|
attrs := staticOrSharedAttributes{}
|
2021-05-06 22:23:19 +02:00
|
|
|
|
2021-05-21 14:37:59 +02:00
|
|
|
setAttrs := func(axis bazel.ConfigurationAxis, config string, props StaticOrSharedProperties) {
|
2021-06-11 14:51:48 +02:00
|
|
|
attrs.Copts.SetSelectValue(axis, config, props.Cflags)
|
|
|
|
attrs.Srcs.SetSelectValue(axis, config, android.BazelLabelForModuleSrc(ctx, props.Srcs))
|
2021-09-20 21:14:39 +02:00
|
|
|
attrs.System_dynamic_deps.SetSelectValue(axis, config, bazelLabelForSharedDeps(ctx, props.System_shared_libs))
|
2021-09-22 21:52:58 +02:00
|
|
|
|
|
|
|
staticDeps := partitionExportedAndImplementationsDeps(ctx, props.Static_libs, props.Export_static_lib_headers, bazelLabelForStaticDeps)
|
|
|
|
attrs.Deps.SetSelectValue(axis, config, staticDeps.export)
|
|
|
|
attrs.Implementation_deps.SetSelectValue(axis, config, staticDeps.implementation)
|
|
|
|
|
|
|
|
sharedDeps := partitionExportedAndImplementationsDeps(ctx, props.Shared_libs, props.Export_shared_lib_headers, bazelLabelForSharedDeps)
|
|
|
|
attrs.Dynamic_deps.SetSelectValue(axis, config, sharedDeps.export)
|
|
|
|
attrs.Implementation_dynamic_deps.SetSelectValue(axis, config, sharedDeps.implementation)
|
|
|
|
|
|
|
|
attrs.Whole_archive_deps.SetSelectValue(axis, config, bazelLabelForWholeDeps(ctx, props.Whole_static_libs))
|
2021-05-26 06:42:42 +02:00
|
|
|
}
|
2021-08-11 16:46:06 +02:00
|
|
|
// system_dynamic_deps distinguishes between nil/empty list behavior:
|
|
|
|
// nil -> use default values
|
|
|
|
// empty list -> no values specified
|
|
|
|
attrs.System_dynamic_deps.ForceSpecifyEmptyList = true
|
2021-04-29 10:15:13 +02:00
|
|
|
|
2021-05-26 06:42:42 +02:00
|
|
|
if isStatic {
|
2021-05-21 14:37:59 +02:00
|
|
|
for axis, configToProps := range module.GetArchVariantProperties(ctx, &StaticProperties{}) {
|
|
|
|
for config, props := range configToProps {
|
|
|
|
if staticOrSharedProps, ok := props.(*StaticProperties); ok {
|
|
|
|
setAttrs(axis, config, staticOrSharedProps.Static)
|
2021-05-26 06:42:42 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2021-05-21 14:37:59 +02:00
|
|
|
for axis, configToProps := range module.GetArchVariantProperties(ctx, &SharedProperties{}) {
|
|
|
|
for config, props := range configToProps {
|
|
|
|
if staticOrSharedProps, ok := props.(*SharedProperties); ok {
|
|
|
|
setAttrs(axis, config, staticOrSharedProps.Shared)
|
2021-05-26 06:42:42 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-04-29 10:15:13 +02:00
|
|
|
}
|
2021-05-26 06:42:42 +02:00
|
|
|
|
2021-06-11 14:51:48 +02:00
|
|
|
cppSrcs, cSrcs, asSrcs := groupSrcsByExtension(ctx, attrs.Srcs)
|
|
|
|
attrs.Srcs = cppSrcs
|
|
|
|
attrs.Srcs_c = cSrcs
|
|
|
|
attrs.Srcs_as = asSrcs
|
2021-06-02 13:10:02 +02:00
|
|
|
|
2021-05-26 06:42:42 +02:00
|
|
|
return attrs
|
2021-04-29 10:15:13 +02:00
|
|
|
}
|
|
|
|
|
2021-05-14 09:02:34 +02:00
|
|
|
// Convenience struct to hold all attributes parsed from prebuilt properties.
|
|
|
|
type prebuiltAttributes struct {
|
|
|
|
Src bazel.LabelAttribute
|
|
|
|
}
|
|
|
|
|
2021-09-01 23:22:09 +02:00
|
|
|
// NOTE: Used outside of Soong repo project, in the clangprebuilts.go bootstrap_go_package
|
2021-05-14 09:02:34 +02:00
|
|
|
func Bp2BuildParsePrebuiltLibraryProps(ctx android.TopDownMutatorContext, module *Module) prebuiltAttributes {
|
|
|
|
var srcLabelAttribute bazel.LabelAttribute
|
|
|
|
|
2021-05-21 14:37:59 +02:00
|
|
|
for axis, configToProps := range module.GetArchVariantProperties(ctx, &prebuiltLinkerProperties{}) {
|
|
|
|
for config, props := range configToProps {
|
|
|
|
if prebuiltLinkerProperties, ok := props.(*prebuiltLinkerProperties); ok {
|
2021-05-14 09:02:34 +02:00
|
|
|
if len(prebuiltLinkerProperties.Srcs) > 1 {
|
2021-05-21 14:37:59 +02:00
|
|
|
ctx.ModuleErrorf("Bp2BuildParsePrebuiltLibraryProps: Expected at most once source file for %s %s\n", axis, config)
|
|
|
|
continue
|
|
|
|
} else if len(prebuiltLinkerProperties.Srcs) == 0 {
|
|
|
|
continue
|
2021-05-14 09:02:34 +02:00
|
|
|
}
|
2021-05-21 14:37:59 +02:00
|
|
|
src := android.BazelLabelForModuleSrcSingle(ctx, prebuiltLinkerProperties.Srcs[0])
|
|
|
|
srcLabelAttribute.SetSelectValue(axis, config, src)
|
2021-05-14 09:02:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return prebuiltAttributes{
|
|
|
|
Src: srcLabelAttribute,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-04-09 12:43:12 +02:00
|
|
|
// Convenience struct to hold all attributes parsed from compiler properties.
|
|
|
|
type compilerAttributes struct {
|
2021-05-25 18:10:58 +02:00
|
|
|
// Options for all languages
|
|
|
|
copts bazel.StringListAttribute
|
|
|
|
// Assembly options and sources
|
|
|
|
asFlags bazel.StringListAttribute
|
|
|
|
asSrcs bazel.LabelListAttribute
|
|
|
|
// C options and sources
|
|
|
|
conlyFlags bazel.StringListAttribute
|
|
|
|
cSrcs bazel.LabelListAttribute
|
|
|
|
// C++ options and sources
|
|
|
|
cppFlags bazel.StringListAttribute
|
2021-04-13 09:14:55 +02:00
|
|
|
srcs bazel.LabelListAttribute
|
2021-08-10 17:58:07 +02:00
|
|
|
|
|
|
|
rtti bazel.BoolAttribute
|
2021-09-23 22:34:35 +02:00
|
|
|
stl *string
|
2021-09-10 16:07:07 +02:00
|
|
|
|
|
|
|
localIncludes bazel.StringListAttribute
|
|
|
|
absoluteIncludes bazel.StringListAttribute
|
2021-04-09 12:43:12 +02:00
|
|
|
}
|
|
|
|
|
2021-03-24 15:04:33 +01:00
|
|
|
// bp2BuildParseCompilerProps returns copts, srcs and hdrs and other attributes.
|
2021-04-09 12:43:12 +02:00
|
|
|
func bp2BuildParseCompilerProps(ctx android.TopDownMutatorContext, module *Module) compilerAttributes {
|
2021-04-27 07:54:20 +02:00
|
|
|
var srcs bazel.LabelListAttribute
|
2021-04-09 12:43:12 +02:00
|
|
|
var copts bazel.StringListAttribute
|
2021-05-25 18:10:58 +02:00
|
|
|
var asFlags bazel.StringListAttribute
|
|
|
|
var conlyFlags bazel.StringListAttribute
|
|
|
|
var cppFlags bazel.StringListAttribute
|
2021-08-10 17:58:07 +02:00
|
|
|
var rtti bazel.BoolAttribute
|
2021-09-10 16:07:07 +02:00
|
|
|
var localIncludes bazel.StringListAttribute
|
|
|
|
var absoluteIncludes bazel.StringListAttribute
|
2021-04-13 09:14:55 +02:00
|
|
|
|
2021-05-25 18:10:58 +02:00
|
|
|
parseCommandLineFlags := func(soongFlags []string) []string {
|
|
|
|
var result []string
|
|
|
|
for _, flag := range soongFlags {
|
2021-05-12 06:33:00 +02:00
|
|
|
// Soong's cflags can contain spaces, like `-include header.h`. For
|
|
|
|
// Bazel's copts, split them up to be compatible with the
|
|
|
|
// no_copts_tokenization feature.
|
2021-05-25 18:10:58 +02:00
|
|
|
result = append(result, strings.Split(flag, " ")...)
|
2021-05-12 06:33:00 +02:00
|
|
|
}
|
2021-05-25 18:10:58 +02:00
|
|
|
return result
|
|
|
|
}
|
|
|
|
|
2021-06-02 19:02:03 +02:00
|
|
|
// Parse srcs from an arch or OS's props value.
|
2021-04-23 11:17:24 +02:00
|
|
|
parseSrcs := func(baseCompilerProps *BaseCompilerProperties) bazel.LabelList {
|
2021-05-13 21:13:04 +02:00
|
|
|
// Add srcs-like dependencies such as generated files.
|
|
|
|
// First create a LabelList containing these dependencies, then merge the values with srcs.
|
|
|
|
generatedHdrsAndSrcs := baseCompilerProps.Generated_headers
|
|
|
|
generatedHdrsAndSrcs = append(generatedHdrsAndSrcs, baseCompilerProps.Generated_sources...)
|
|
|
|
generatedHdrsAndSrcsLabelList := android.BazelLabelForModuleDeps(ctx, generatedHdrsAndSrcs)
|
|
|
|
|
2021-06-02 19:02:03 +02:00
|
|
|
allSrcsLabelList := android.BazelLabelForModuleSrcExcludes(ctx, baseCompilerProps.Srcs, baseCompilerProps.Exclude_srcs)
|
2021-05-13 21:13:04 +02:00
|
|
|
return bazel.AppendBazelLabelLists(allSrcsLabelList, generatedHdrsAndSrcsLabelList)
|
2021-04-23 11:17:24 +02:00
|
|
|
}
|
|
|
|
|
2021-05-21 14:37:59 +02:00
|
|
|
archVariantCompilerProps := module.GetArchVariantProperties(ctx, &BaseCompilerProperties{})
|
|
|
|
for axis, configToProps := range archVariantCompilerProps {
|
|
|
|
for config, props := range configToProps {
|
|
|
|
if baseCompilerProps, ok := props.(*BaseCompilerProperties); ok {
|
|
|
|
// If there's arch specific srcs or exclude_srcs, generate a select entry for it.
|
|
|
|
// TODO(b/186153868): do this for OS specific srcs and exclude_srcs too.
|
|
|
|
if len(baseCompilerProps.Srcs) > 0 || len(baseCompilerProps.Exclude_srcs) > 0 {
|
|
|
|
srcsList := parseSrcs(baseCompilerProps)
|
|
|
|
srcs.SetSelectValue(axis, config, srcsList)
|
|
|
|
}
|
2021-04-23 11:17:24 +02:00
|
|
|
|
2021-07-13 17:47:44 +02:00
|
|
|
archVariantCopts := parseCommandLineFlags(baseCompilerProps.Cflags)
|
|
|
|
archVariantAsflags := parseCommandLineFlags(baseCompilerProps.Asflags)
|
|
|
|
|
2021-09-10 16:07:07 +02:00
|
|
|
localIncludeDirs := baseCompilerProps.Local_include_dirs
|
|
|
|
if axis == bazel.NoConfigAxis && includeBuildDirectory(baseCompilerProps.Include_build_directory) {
|
|
|
|
localIncludeDirs = append(localIncludeDirs, ".")
|
2021-08-11 16:46:06 +02:00
|
|
|
}
|
|
|
|
|
2021-09-10 16:07:07 +02:00
|
|
|
absoluteIncludes.SetSelectValue(axis, config, baseCompilerProps.Include_dirs)
|
|
|
|
localIncludes.SetSelectValue(axis, config, localIncludeDirs)
|
|
|
|
|
2021-07-13 17:47:44 +02:00
|
|
|
copts.SetSelectValue(axis, config, archVariantCopts)
|
|
|
|
asFlags.SetSelectValue(axis, config, archVariantAsflags)
|
2021-05-21 14:37:59 +02:00
|
|
|
conlyFlags.SetSelectValue(axis, config, parseCommandLineFlags(baseCompilerProps.Conlyflags))
|
|
|
|
cppFlags.SetSelectValue(axis, config, parseCommandLineFlags(baseCompilerProps.Cppflags))
|
2021-08-10 17:58:07 +02:00
|
|
|
rtti.SetSelectValue(axis, config, baseCompilerProps.Rtti)
|
2021-05-21 14:37:59 +02:00
|
|
|
}
|
2021-04-05 12:35:13 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-02 19:02:03 +02:00
|
|
|
srcs.ResolveExcludes()
|
2021-09-10 16:07:07 +02:00
|
|
|
absoluteIncludes.DeduplicateAxesFromBase()
|
|
|
|
localIncludes.DeduplicateAxesFromBase()
|
2021-04-05 12:35:13 +02:00
|
|
|
|
2021-05-26 14:45:30 +02:00
|
|
|
productVarPropNameToAttribute := map[string]*bazel.StringListAttribute{
|
|
|
|
"Cflags": &copts,
|
|
|
|
"Asflags": &asFlags,
|
|
|
|
"CppFlags": &cppFlags,
|
|
|
|
}
|
2021-05-06 19:54:29 +02:00
|
|
|
productVariableProps := android.ProductVariableProperties(ctx)
|
2021-05-26 14:45:30 +02:00
|
|
|
for propName, attr := range productVarPropNameToAttribute {
|
|
|
|
if props, exists := productVariableProps[propName]; exists {
|
|
|
|
for _, prop := range props {
|
|
|
|
flags, ok := prop.Property.([]string)
|
|
|
|
if !ok {
|
|
|
|
ctx.ModuleErrorf("Could not convert product variable %s property", proptools.PropertyNameForField(propName))
|
|
|
|
}
|
|
|
|
newFlags, _ := bazel.TryVariableSubstitutions(flags, prop.ProductConfigVariable)
|
2021-06-02 22:02:22 +02:00
|
|
|
attr.SetSelectValue(bazel.ProductVariableConfigurationAxis(prop.FullConfig), prop.FullConfig, newFlags)
|
2021-05-06 19:54:29 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-02 13:10:02 +02:00
|
|
|
srcs, cSrcs, asSrcs := groupSrcsByExtension(ctx, srcs)
|
|
|
|
|
2021-09-23 22:34:35 +02:00
|
|
|
var stl *string = nil
|
|
|
|
stlPropsByArch := module.GetArchVariantProperties(ctx, &StlProperties{})
|
|
|
|
for _, configToProps := range stlPropsByArch {
|
|
|
|
for _, props := range configToProps {
|
|
|
|
if stlProps, ok := props.(*StlProperties); ok {
|
|
|
|
if stlProps.Stl != nil {
|
|
|
|
if stl == nil {
|
|
|
|
stl = stlProps.Stl
|
|
|
|
} else {
|
|
|
|
if stl != stlProps.Stl {
|
|
|
|
ctx.ModuleErrorf("Unsupported conversion: module with different stl for different variants: %s and %s", *stl, stlProps.Stl)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-04-09 12:43:12 +02:00
|
|
|
return compilerAttributes{
|
2021-09-10 16:07:07 +02:00
|
|
|
copts: copts,
|
|
|
|
srcs: srcs,
|
|
|
|
asFlags: asFlags,
|
|
|
|
asSrcs: asSrcs,
|
|
|
|
cSrcs: cSrcs,
|
|
|
|
conlyFlags: conlyFlags,
|
|
|
|
cppFlags: cppFlags,
|
|
|
|
rtti: rtti,
|
2021-09-23 22:34:35 +02:00
|
|
|
stl: stl,
|
2021-09-10 16:07:07 +02:00
|
|
|
localIncludes: localIncludes,
|
|
|
|
absoluteIncludes: absoluteIncludes,
|
2021-04-09 12:43:12 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Convenience struct to hold all attributes parsed from linker properties.
|
|
|
|
type linkerAttributes struct {
|
2021-09-22 21:52:58 +02:00
|
|
|
deps bazel.LabelListAttribute
|
|
|
|
implementationDeps bazel.LabelListAttribute
|
|
|
|
dynamicDeps bazel.LabelListAttribute
|
|
|
|
implementationDynamicDeps bazel.LabelListAttribute
|
|
|
|
wholeArchiveDeps bazel.LabelListAttribute
|
|
|
|
systemDynamicDeps bazel.LabelListAttribute
|
|
|
|
|
2021-09-17 13:38:09 +02:00
|
|
|
linkCrt bazel.BoolAttribute
|
2021-06-09 09:18:37 +02:00
|
|
|
useLibcrt bazel.BoolAttribute
|
|
|
|
linkopts bazel.StringListAttribute
|
|
|
|
versionScript bazel.LabelAttribute
|
|
|
|
stripKeepSymbols bazel.BoolAttribute
|
|
|
|
stripKeepSymbolsAndDebugFrame bazel.BoolAttribute
|
|
|
|
stripKeepSymbolsList bazel.StringListAttribute
|
|
|
|
stripAll bazel.BoolAttribute
|
|
|
|
stripNone bazel.BoolAttribute
|
2021-04-05 12:35:13 +02:00
|
|
|
}
|
|
|
|
|
2021-05-10 05:55:51 +02:00
|
|
|
// FIXME(b/187655838): Use the existing linkerFlags() function instead of duplicating logic here
|
|
|
|
func getBp2BuildLinkerFlags(linkerProperties *BaseLinkerProperties) []string {
|
|
|
|
flags := linkerProperties.Ldflags
|
|
|
|
if !BoolDefault(linkerProperties.Pack_relocations, true) {
|
|
|
|
flags = append(flags, "-Wl,--pack-dyn-relocs=none")
|
|
|
|
}
|
|
|
|
return flags
|
|
|
|
}
|
|
|
|
|
2021-04-30 15:35:09 +02:00
|
|
|
// bp2BuildParseLinkerProps parses the linker properties of a module, including
|
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
|
|
|
// configurable attribute values.
|
2021-04-09 12:43:12 +02:00
|
|
|
func bp2BuildParseLinkerProps(ctx android.TopDownMutatorContext, module *Module) linkerAttributes {
|
2021-09-22 21:52:58 +02:00
|
|
|
|
2021-06-02 22:02:22 +02:00
|
|
|
var headerDeps bazel.LabelListAttribute
|
2021-09-22 21:52:58 +02:00
|
|
|
var implementationHeaderDeps bazel.LabelListAttribute
|
|
|
|
var deps bazel.LabelListAttribute
|
|
|
|
var implementationDeps bazel.LabelListAttribute
|
2021-05-06 08:40:33 +02:00
|
|
|
var dynamicDeps bazel.LabelListAttribute
|
2021-09-22 21:52:58 +02:00
|
|
|
var implementationDynamicDeps bazel.LabelListAttribute
|
2021-05-06 22:23:19 +02:00
|
|
|
var wholeArchiveDeps bazel.LabelListAttribute
|
2021-08-11 16:46:06 +02:00
|
|
|
systemSharedDeps := bazel.LabelListAttribute{ForceSpecifyEmptyList: true}
|
2021-09-22 21:52:58 +02:00
|
|
|
|
2021-03-24 15:04:33 +01:00
|
|
|
var linkopts bazel.StringListAttribute
|
2021-04-30 15:35:09 +02:00
|
|
|
var versionScript bazel.LabelAttribute
|
2021-09-17 13:38:09 +02:00
|
|
|
var linkCrt bazel.BoolAttribute
|
2021-06-03 19:43:01 +02:00
|
|
|
var useLibcrt bazel.BoolAttribute
|
2021-03-24 15:04:33 +01:00
|
|
|
|
2021-06-09 09:18:37 +02:00
|
|
|
var stripKeepSymbols bazel.BoolAttribute
|
|
|
|
var stripKeepSymbolsAndDebugFrame bazel.BoolAttribute
|
|
|
|
var stripKeepSymbolsList bazel.StringListAttribute
|
|
|
|
var stripAll bazel.BoolAttribute
|
|
|
|
var stripNone bazel.BoolAttribute
|
|
|
|
|
|
|
|
for axis, configToProps := range module.GetArchVariantProperties(ctx, &StripProperties{}) {
|
|
|
|
for config, props := range configToProps {
|
|
|
|
if stripProperties, ok := props.(*StripProperties); ok {
|
|
|
|
stripKeepSymbols.SetSelectValue(axis, config, stripProperties.Strip.Keep_symbols)
|
|
|
|
stripKeepSymbolsList.SetSelectValue(axis, config, stripProperties.Strip.Keep_symbols_list)
|
|
|
|
stripKeepSymbolsAndDebugFrame.SetSelectValue(axis, config, stripProperties.Strip.Keep_symbols_and_debug_frame)
|
|
|
|
stripAll.SetSelectValue(axis, config, stripProperties.Strip.All)
|
|
|
|
stripNone.SetSelectValue(axis, config, stripProperties.Strip.None)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-17 13:38:09 +02:00
|
|
|
// Use a single variable to capture usage of nocrt in arch variants, so there's only 1 error message for this module
|
|
|
|
var disallowedArchVariantCrt bool
|
|
|
|
|
2021-05-21 14:37:59 +02:00
|
|
|
for axis, configToProps := range module.GetArchVariantProperties(ctx, &BaseLinkerProperties{}) {
|
|
|
|
for config, props := range configToProps {
|
|
|
|
if baseLinkerProps, ok := props.(*BaseLinkerProperties); ok {
|
2021-09-22 21:52:58 +02:00
|
|
|
|
2021-08-11 16:46:06 +02:00
|
|
|
// Excludes to parallel Soong:
|
|
|
|
// https://cs.android.com/android/platform/superproject/+/master:build/soong/cc/linker.go;l=247-249;drc=088b53577dde6e40085ffd737a1ae96ad82fc4b0
|
2021-06-02 22:02:22 +02:00
|
|
|
staticLibs := android.FirstUniqueStrings(baseLinkerProps.Static_libs)
|
2021-09-22 21:52:58 +02:00
|
|
|
staticDeps := partitionExportedAndImplementationsDepsExcludes(ctx, staticLibs, baseLinkerProps.Exclude_static_libs, baseLinkerProps.Export_static_lib_headers, bazelLabelForStaticDepsExcludes)
|
|
|
|
deps.SetSelectValue(axis, config, staticDeps.export)
|
|
|
|
implementationDeps.SetSelectValue(axis, config, staticDeps.implementation)
|
|
|
|
|
|
|
|
wholeStaticLibs := android.FirstUniqueStrings(baseLinkerProps.Whole_static_libs)
|
|
|
|
wholeArchiveDeps.SetSelectValue(axis, config, bazelLabelForWholeDepsExcludes(ctx, wholeStaticLibs, baseLinkerProps.Exclude_static_libs))
|
bp2build: handle system_shared_libs
- If no system_shared_libs is specified, bp2build writes no attribute
value. In this case, the bazel library macros determine the correct
default behavior.
- If any system_shared_libs is specified for any variant, then bp2build
writes the value verbatim. This includes if an empty list is specified,
as this should override defaulting behavior.
Note this defaulting behavior is incomplete and will be incorrect in
corner cases. For example, if, in an Android.bp, system_shared_libs is
specified for os.linux_bionic but not for os.android, then the bazel
default for os.android will be incorrect. However, there are no current
modules in AOSP which fit this case.
As a related fix, supports static struct for cc_library_static.
Also, removes some elements from the bp2build denylist.
Test: mixed_droid CI
Change-Id: Iee5feeaaf05e8e7209c7a90c913173832ad7bf91
2021-08-04 03:01:05 +02:00
|
|
|
|
2021-08-11 16:46:06 +02:00
|
|
|
systemSharedLibs := baseLinkerProps.System_shared_libs
|
|
|
|
// systemSharedLibs distinguishes between nil/empty list behavior:
|
|
|
|
// nil -> use default values
|
|
|
|
// empty list -> no values specified
|
|
|
|
if len(systemSharedLibs) > 0 {
|
|
|
|
systemSharedLibs = android.FirstUniqueStrings(systemSharedLibs)
|
bp2build: handle system_shared_libs
- If no system_shared_libs is specified, bp2build writes no attribute
value. In this case, the bazel library macros determine the correct
default behavior.
- If any system_shared_libs is specified for any variant, then bp2build
writes the value verbatim. This includes if an empty list is specified,
as this should override defaulting behavior.
Note this defaulting behavior is incomplete and will be incorrect in
corner cases. For example, if, in an Android.bp, system_shared_libs is
specified for os.linux_bionic but not for os.android, then the bazel
default for os.android will be incorrect. However, there are no current
modules in AOSP which fit this case.
As a related fix, supports static struct for cc_library_static.
Also, removes some elements from the bp2build denylist.
Test: mixed_droid CI
Change-Id: Iee5feeaaf05e8e7209c7a90c913173832ad7bf91
2021-08-04 03:01:05 +02:00
|
|
|
}
|
2021-09-20 21:14:39 +02:00
|
|
|
systemSharedDeps.SetSelectValue(axis, config, bazelLabelForSharedDeps(ctx, systemSharedLibs))
|
bp2build: handle system_shared_libs
- If no system_shared_libs is specified, bp2build writes no attribute
value. In this case, the bazel library macros determine the correct
default behavior.
- If any system_shared_libs is specified for any variant, then bp2build
writes the value verbatim. This includes if an empty list is specified,
as this should override defaulting behavior.
Note this defaulting behavior is incomplete and will be incorrect in
corner cases. For example, if, in an Android.bp, system_shared_libs is
specified for os.linux_bionic but not for os.android, then the bazel
default for os.android will be incorrect. However, there are no current
modules in AOSP which fit this case.
As a related fix, supports static struct for cc_library_static.
Also, removes some elements from the bp2build denylist.
Test: mixed_droid CI
Change-Id: Iee5feeaaf05e8e7209c7a90c913173832ad7bf91
2021-08-04 03:01:05 +02:00
|
|
|
|
|
|
|
sharedLibs := android.FirstUniqueStrings(baseLinkerProps.Shared_libs)
|
2021-09-22 21:52:58 +02:00
|
|
|
sharedDeps := partitionExportedAndImplementationsDepsExcludes(ctx, sharedLibs, baseLinkerProps.Exclude_shared_libs, baseLinkerProps.Export_shared_lib_headers, bazelLabelForSharedDepsExcludes)
|
|
|
|
dynamicDeps.SetSelectValue(axis, config, sharedDeps.export)
|
|
|
|
implementationDynamicDeps.SetSelectValue(axis, config, sharedDeps.implementation)
|
2021-06-02 22:02:22 +02:00
|
|
|
|
|
|
|
headerLibs := android.FirstUniqueStrings(baseLinkerProps.Header_libs)
|
2021-09-22 21:52:58 +02:00
|
|
|
hDeps := partitionExportedAndImplementationsDeps(ctx, headerLibs, baseLinkerProps.Export_header_lib_headers, bazelLabelForHeaderDeps)
|
|
|
|
|
|
|
|
headerDeps.SetSelectValue(axis, config, hDeps.export)
|
|
|
|
implementationHeaderDeps.SetSelectValue(axis, config, hDeps.implementation)
|
2021-05-19 12:49:02 +02:00
|
|
|
|
2021-06-02 22:02:22 +02:00
|
|
|
linkopts.SetSelectValue(axis, config, getBp2BuildLinkerFlags(baseLinkerProps))
|
2021-05-27 08:15:54 +02:00
|
|
|
if baseLinkerProps.Version_script != nil {
|
2021-05-21 14:37:59 +02:00
|
|
|
versionScript.SetSelectValue(axis, config, android.BazelLabelForModuleSrcSingle(ctx, *baseLinkerProps.Version_script))
|
2021-05-27 08:15:54 +02:00
|
|
|
}
|
2021-06-03 19:43:01 +02:00
|
|
|
useLibcrt.SetSelectValue(axis, config, baseLinkerProps.libCrt())
|
2021-09-17 13:38:09 +02:00
|
|
|
|
|
|
|
// it's very unlikely for nocrt to be arch variant, so bp2build doesn't support it.
|
|
|
|
if baseLinkerProps.crt() != nil {
|
|
|
|
if axis == bazel.NoConfigAxis {
|
|
|
|
linkCrt.SetSelectValue(axis, config, baseLinkerProps.crt())
|
|
|
|
} else if axis == bazel.ArchConfigurationAxis {
|
|
|
|
disallowedArchVariantCrt = true
|
|
|
|
}
|
|
|
|
}
|
2021-06-02 22:02:22 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-17 13:38:09 +02:00
|
|
|
if disallowedArchVariantCrt {
|
|
|
|
ctx.ModuleErrorf("nocrt is not supported for arch variants")
|
|
|
|
}
|
|
|
|
|
2021-06-02 22:02:22 +02:00
|
|
|
type productVarDep struct {
|
|
|
|
// the name of the corresponding excludes field, if one exists
|
|
|
|
excludesField string
|
|
|
|
// reference to the bazel attribute that should be set for the given product variable config
|
|
|
|
attribute *bazel.LabelListAttribute
|
2021-06-11 00:20:06 +02:00
|
|
|
|
2021-09-20 21:14:39 +02:00
|
|
|
depResolutionFunc func(ctx android.TopDownMutatorContext, modules, excludes []string) bazel.LabelList
|
2021-06-02 22:02:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
productVarToDepFields := map[string]productVarDep{
|
|
|
|
// product variables do not support exclude_shared_libs
|
2021-09-22 21:52:58 +02:00
|
|
|
"Shared_libs": productVarDep{attribute: &implementationDynamicDeps, depResolutionFunc: bazelLabelForSharedDepsExcludes},
|
|
|
|
"Static_libs": productVarDep{"Exclude_static_libs", &implementationDeps, bazelLabelForStaticDepsExcludes},
|
2021-09-20 21:14:39 +02:00
|
|
|
"Whole_static_libs": productVarDep{"Exclude_static_libs", &wholeArchiveDeps, bazelLabelForWholeDepsExcludes},
|
2021-06-02 22:02:22 +02:00
|
|
|
}
|
2021-05-27 08:15:54 +02:00
|
|
|
|
2021-06-02 22:02:22 +02:00
|
|
|
productVariableProps := android.ProductVariableProperties(ctx)
|
|
|
|
for name, dep := range productVarToDepFields {
|
|
|
|
props, exists := productVariableProps[name]
|
|
|
|
excludeProps, excludesExists := productVariableProps[dep.excludesField]
|
|
|
|
// if neither an include or excludes property exists, then skip it
|
|
|
|
if !exists && !excludesExists {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
// collect all the configurations that an include or exclude property exists for.
|
|
|
|
// we want to iterate all configurations rather than either the include or exclude because for a
|
|
|
|
// particular configuration we may have only and include or only an exclude to handle
|
|
|
|
configs := make(map[string]bool, len(props)+len(excludeProps))
|
|
|
|
for config := range props {
|
|
|
|
configs[config] = true
|
|
|
|
}
|
|
|
|
for config := range excludeProps {
|
|
|
|
configs[config] = true
|
|
|
|
}
|
|
|
|
|
|
|
|
for config := range configs {
|
|
|
|
prop, includesExists := props[config]
|
|
|
|
excludesProp, excludesExists := excludeProps[config]
|
|
|
|
var includes, excludes []string
|
|
|
|
var ok bool
|
|
|
|
// if there was no includes/excludes property, casting fails and that's expected
|
|
|
|
if includes, ok = prop.Property.([]string); includesExists && !ok {
|
|
|
|
ctx.ModuleErrorf("Could not convert product variable %s property", name)
|
2021-05-19 12:49:02 +02:00
|
|
|
}
|
2021-06-02 22:02:22 +02:00
|
|
|
if excludes, ok = excludesProp.Property.([]string); excludesExists && !ok {
|
|
|
|
ctx.ModuleErrorf("Could not convert product variable %s property", dep.excludesField)
|
|
|
|
}
|
2021-06-11 00:20:06 +02:00
|
|
|
|
|
|
|
dep.attribute.SetSelectValue(bazel.ProductVariableConfigurationAxis(config), config, dep.depResolutionFunc(ctx, android.FirstUniqueStrings(includes), excludes))
|
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-09-22 21:52:58 +02:00
|
|
|
headerDeps.Append(deps)
|
|
|
|
implementationHeaderDeps.Append(implementationDeps)
|
|
|
|
|
|
|
|
headerDeps.ResolveExcludes()
|
|
|
|
implementationHeaderDeps.ResolveExcludes()
|
2021-06-02 22:02:22 +02:00
|
|
|
dynamicDeps.ResolveExcludes()
|
2021-09-22 21:52:58 +02:00
|
|
|
implementationDynamicDeps.ResolveExcludes()
|
2021-06-02 22:02:22 +02:00
|
|
|
wholeArchiveDeps.ResolveExcludes()
|
|
|
|
|
2021-04-09 12:43:12 +02:00
|
|
|
return linkerAttributes{
|
2021-09-22 21:52:58 +02:00
|
|
|
deps: headerDeps,
|
|
|
|
implementationDeps: implementationHeaderDeps,
|
|
|
|
dynamicDeps: dynamicDeps,
|
|
|
|
implementationDynamicDeps: implementationDynamicDeps,
|
|
|
|
wholeArchiveDeps: wholeArchiveDeps,
|
|
|
|
systemDynamicDeps: systemSharedDeps,
|
|
|
|
|
2021-09-17 13:38:09 +02:00
|
|
|
linkCrt: linkCrt,
|
2021-09-22 21:52:58 +02:00
|
|
|
linkopts: linkopts,
|
|
|
|
useLibcrt: useLibcrt,
|
|
|
|
versionScript: versionScript,
|
2021-06-09 09:18:37 +02:00
|
|
|
|
|
|
|
// Strip properties
|
|
|
|
stripKeepSymbols: stripKeepSymbols,
|
|
|
|
stripKeepSymbolsAndDebugFrame: stripKeepSymbolsAndDebugFrame,
|
|
|
|
stripKeepSymbolsList: stripKeepSymbolsList,
|
|
|
|
stripAll: stripAll,
|
|
|
|
stripNone: stripNone,
|
2021-04-09 12:43:12 +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
|
|
|
}
|
|
|
|
|
2021-04-13 09:14:55 +02:00
|
|
|
// Relativize a list of root-relative paths with respect to the module's
|
|
|
|
// directory.
|
|
|
|
//
|
|
|
|
// include_dirs Soong prop are root-relative (b/183742505), but
|
|
|
|
// local_include_dirs, export_include_dirs and export_system_include_dirs are
|
|
|
|
// module dir relative. This function makes a list of paths entirely module dir
|
|
|
|
// relative.
|
|
|
|
//
|
|
|
|
// For the `include` attribute, Bazel wants the paths to be relative to the
|
|
|
|
// module.
|
|
|
|
func bp2BuildMakePathsRelativeToModule(ctx android.BazelConversionPathContext, paths []string) []string {
|
2021-04-06 22:06:21 +02:00
|
|
|
var relativePaths []string
|
|
|
|
for _, path := range paths {
|
2021-04-13 09:14:55 +02:00
|
|
|
// Semantics of filepath.Rel: join(ModuleDir, rel(ModuleDir, path)) == path
|
|
|
|
relativePath, err := filepath.Rel(ctx.ModuleDir(), path)
|
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
2021-04-06 22:06:21 +02:00
|
|
|
relativePaths = append(relativePaths, relativePath)
|
|
|
|
}
|
|
|
|
return relativePaths
|
|
|
|
}
|
|
|
|
|
2021-09-09 20:08:21 +02:00
|
|
|
// BazelIncludes contains information about -I and -isystem paths from a module converted to Bazel
|
|
|
|
// attributes.
|
|
|
|
type BazelIncludes struct {
|
|
|
|
Includes bazel.StringListAttribute
|
|
|
|
SystemIncludes bazel.StringListAttribute
|
|
|
|
}
|
|
|
|
|
|
|
|
func bp2BuildParseExportedIncludes(ctx android.TopDownMutatorContext, module *Module) BazelIncludes {
|
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
|
|
|
libraryDecorator := module.linker.(*libraryDecorator)
|
2021-05-14 09:02:34 +02:00
|
|
|
return bp2BuildParseExportedIncludesHelper(ctx, module, libraryDecorator)
|
|
|
|
}
|
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-09-09 20:08:21 +02:00
|
|
|
// Bp2buildParseExportedIncludesForPrebuiltLibrary returns a BazelIncludes with Bazel-ified values
|
|
|
|
// to export includes from the underlying module's properties.
|
|
|
|
func Bp2BuildParseExportedIncludesForPrebuiltLibrary(ctx android.TopDownMutatorContext, module *Module) BazelIncludes {
|
2021-05-14 09:02:34 +02:00
|
|
|
prebuiltLibraryLinker := module.linker.(*prebuiltLibraryLinker)
|
|
|
|
libraryDecorator := prebuiltLibraryLinker.libraryDecorator
|
|
|
|
return bp2BuildParseExportedIncludesHelper(ctx, module, libraryDecorator)
|
|
|
|
}
|
|
|
|
|
|
|
|
// bp2BuildParseExportedIncludes creates a string list attribute contains the
|
|
|
|
// exported included directories of a module.
|
2021-09-09 20:08:21 +02:00
|
|
|
func bp2BuildParseExportedIncludesHelper(ctx android.TopDownMutatorContext, module *Module, libraryDecorator *libraryDecorator) BazelIncludes {
|
|
|
|
exported := BazelIncludes{}
|
2021-05-21 14:37:59 +02:00
|
|
|
for axis, configToProps := range module.GetArchVariantProperties(ctx, &FlagExporterProperties{}) {
|
|
|
|
for config, props := range configToProps {
|
|
|
|
if flagExporterProperties, ok := props.(*FlagExporterProperties); ok {
|
2021-09-09 20:08:21 +02:00
|
|
|
if len(flagExporterProperties.Export_include_dirs) > 0 {
|
|
|
|
exported.Includes.SetSelectValue(axis, config, flagExporterProperties.Export_include_dirs)
|
|
|
|
}
|
|
|
|
if len(flagExporterProperties.Export_system_include_dirs) > 0 {
|
|
|
|
exported.SystemIncludes.SetSelectValue(axis, config, flagExporterProperties.Export_system_include_dirs)
|
2021-05-19 12:49:02 +02:00
|
|
|
}
|
2021-04-26 13:49:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-09-09 20:08:21 +02:00
|
|
|
exported.Includes.DeduplicateAxesFromBase()
|
|
|
|
exported.SystemIncludes.DeduplicateAxesFromBase()
|
2021-04-26 13:49:08 +02:00
|
|
|
|
2021-09-09 20:08:21 +02:00
|
|
|
return exported
|
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-09-20 21:14:39 +02:00
|
|
|
|
|
|
|
func bazelLabelForStaticModule(ctx android.TopDownMutatorContext, m blueprint.Module) string {
|
|
|
|
label := android.BazelModuleLabel(ctx, m)
|
|
|
|
if aModule, ok := m.(android.Module); ok {
|
|
|
|
if ctx.OtherModuleType(aModule) == "cc_library" && !android.GenerateCcLibraryStaticOnly(m.Name()) {
|
|
|
|
label += "_bp2build_cc_library_static"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return label
|
|
|
|
}
|
|
|
|
|
|
|
|
func bazelLabelForSharedModule(ctx android.TopDownMutatorContext, m blueprint.Module) string {
|
|
|
|
// cc_library, at it's root name, propagates the shared library, which depends on the static
|
|
|
|
// library.
|
|
|
|
return android.BazelModuleLabel(ctx, m)
|
|
|
|
}
|
|
|
|
|
|
|
|
func bazelLabelForStaticWholeModuleDeps(ctx android.TopDownMutatorContext, m blueprint.Module) string {
|
|
|
|
label := bazelLabelForStaticModule(ctx, m)
|
|
|
|
if aModule, ok := m.(android.Module); ok {
|
|
|
|
if android.IsModulePrebuilt(aModule) {
|
|
|
|
label += "_alwayslink"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return label
|
|
|
|
}
|
|
|
|
|
|
|
|
func bazelLabelForWholeDeps(ctx android.TopDownMutatorContext, modules []string) bazel.LabelList {
|
|
|
|
return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForStaticWholeModuleDeps)
|
|
|
|
}
|
|
|
|
|
|
|
|
func bazelLabelForWholeDepsExcludes(ctx android.TopDownMutatorContext, modules, excludes []string) bazel.LabelList {
|
|
|
|
return android.BazelLabelForModuleDepsExcludesWithFn(ctx, modules, excludes, bazelLabelForStaticWholeModuleDeps)
|
|
|
|
}
|
|
|
|
|
|
|
|
func bazelLabelForStaticDepsExcludes(ctx android.TopDownMutatorContext, modules, excludes []string) bazel.LabelList {
|
|
|
|
return android.BazelLabelForModuleDepsExcludesWithFn(ctx, modules, excludes, bazelLabelForStaticModule)
|
|
|
|
}
|
|
|
|
|
|
|
|
func bazelLabelForStaticDeps(ctx android.TopDownMutatorContext, modules []string) bazel.LabelList {
|
|
|
|
return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForStaticModule)
|
|
|
|
}
|
|
|
|
|
|
|
|
func bazelLabelForSharedDeps(ctx android.TopDownMutatorContext, modules []string) bazel.LabelList {
|
|
|
|
return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForSharedModule)
|
|
|
|
}
|
|
|
|
|
|
|
|
func bazelLabelForHeaderDeps(ctx android.TopDownMutatorContext, modules []string) bazel.LabelList {
|
|
|
|
// This is not elegant, but bp2build's shared library targets only propagate
|
|
|
|
// their header information as part of the normal C++ provider.
|
|
|
|
return bazelLabelForSharedDeps(ctx, modules)
|
|
|
|
}
|
|
|
|
|
|
|
|
func bazelLabelForSharedDepsExcludes(ctx android.TopDownMutatorContext, modules, excludes []string) bazel.LabelList {
|
|
|
|
return android.BazelLabelForModuleDepsExcludesWithFn(ctx, modules, excludes, bazelLabelForSharedModule)
|
|
|
|
}
|