2020-11-26 01:06:39 +01:00
|
|
|
package bp2build
|
|
|
|
|
|
|
|
import (
|
2021-05-19 15:14:26 +02:00
|
|
|
"testing"
|
|
|
|
|
2020-11-26 01:06:39 +01:00
|
|
|
"android/soong/android"
|
2020-12-14 14:25:34 +01:00
|
|
|
"android/soong/bazel"
|
2020-11-26 01:06:39 +01: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
|
|
|
var (
|
|
|
|
// A default configuration for tests to not have to specify bp2build_available on top level targets.
|
|
|
|
bp2buildConfig = android.Bp2BuildConfig{
|
|
|
|
android.BP2BUILD_TOPLEVEL: android.Bp2BuildDefaultTrueRecursively,
|
|
|
|
}
|
2021-05-19 15:14:26 +02:00
|
|
|
|
|
|
|
buildDir 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
|
|
|
)
|
|
|
|
|
2020-11-26 01:06:39 +01:00
|
|
|
type nestedProps struct {
|
|
|
|
Nested_prop string
|
|
|
|
}
|
|
|
|
|
|
|
|
type customProps struct {
|
|
|
|
Bool_prop bool
|
|
|
|
Bool_ptr_prop *bool
|
|
|
|
// Ensure that properties tagged `blueprint:mutated` are omitted
|
|
|
|
Int_prop int `blueprint:"mutated"`
|
|
|
|
Int64_ptr_prop *int64
|
|
|
|
String_prop string
|
|
|
|
String_ptr_prop *string
|
|
|
|
String_list_prop []string
|
|
|
|
|
|
|
|
Nested_props nestedProps
|
|
|
|
Nested_props_ptr *nestedProps
|
2021-04-22 00:15:34 +02:00
|
|
|
|
2021-08-04 21:17:02 +02:00
|
|
|
Arch_paths []string `android:"path,arch_variant"`
|
|
|
|
Arch_paths_exclude []string `android:"path,arch_variant"`
|
2020-11-26 01:06:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type customModule struct {
|
|
|
|
android.ModuleBase
|
2021-02-17 16:17:28 +01:00
|
|
|
android.BazelModuleBase
|
2020-11-26 01:06:39 +01:00
|
|
|
|
|
|
|
props customProps
|
|
|
|
}
|
|
|
|
|
2021-05-19 15:14:26 +02:00
|
|
|
func errored(t *testing.T, desc string, errs []error) bool {
|
|
|
|
t.Helper()
|
|
|
|
if len(errs) > 0 {
|
|
|
|
for _, err := range errs {
|
|
|
|
t.Errorf("%s: %s", desc, err)
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2020-11-26 01:06:39 +01:00
|
|
|
// OutputFiles is needed because some instances of this module use dist with a
|
|
|
|
// tag property which requires the module implements OutputFileProducer.
|
|
|
|
func (m *customModule) OutputFiles(tag string) (android.Paths, error) {
|
|
|
|
return android.PathsForTesting("path" + tag), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (m *customModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|
|
|
// nothing for now.
|
|
|
|
}
|
|
|
|
|
|
|
|
func customModuleFactoryBase() android.Module {
|
|
|
|
module := &customModule{}
|
|
|
|
module.AddProperties(&module.props)
|
2021-02-17 16:17:28 +01:00
|
|
|
android.InitBazelModule(module)
|
2020-11-26 01:06:39 +01:00
|
|
|
return module
|
|
|
|
}
|
|
|
|
|
|
|
|
func customModuleFactory() android.Module {
|
|
|
|
m := customModuleFactoryBase()
|
2021-04-22 00:15:34 +02:00
|
|
|
android.InitAndroidArchModule(m, android.HostAndDeviceSupported, android.MultilibBoth)
|
2020-11-26 01:06:39 +01:00
|
|
|
return m
|
|
|
|
}
|
|
|
|
|
|
|
|
type testProps struct {
|
|
|
|
Test_prop struct {
|
|
|
|
Test_string_prop string
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type customTestModule struct {
|
|
|
|
android.ModuleBase
|
|
|
|
|
|
|
|
props customProps
|
|
|
|
test_props testProps
|
|
|
|
}
|
|
|
|
|
|
|
|
func (m *customTestModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|
|
|
// nothing for now.
|
|
|
|
}
|
|
|
|
|
|
|
|
func customTestModuleFactoryBase() android.Module {
|
|
|
|
m := &customTestModule{}
|
|
|
|
m.AddProperties(&m.props)
|
|
|
|
m.AddProperties(&m.test_props)
|
|
|
|
return m
|
|
|
|
}
|
|
|
|
|
|
|
|
func customTestModuleFactory() android.Module {
|
|
|
|
m := customTestModuleFactoryBase()
|
|
|
|
android.InitAndroidModule(m)
|
|
|
|
return m
|
|
|
|
}
|
|
|
|
|
|
|
|
type customDefaultsModule struct {
|
|
|
|
android.ModuleBase
|
|
|
|
android.DefaultsModuleBase
|
|
|
|
}
|
|
|
|
|
|
|
|
func customDefaultsModuleFactoryBase() android.DefaultsModule {
|
|
|
|
module := &customDefaultsModule{}
|
|
|
|
module.AddProperties(&customProps{})
|
|
|
|
return module
|
|
|
|
}
|
|
|
|
|
|
|
|
func customDefaultsModuleFactoryBasic() android.Module {
|
|
|
|
return customDefaultsModuleFactoryBase()
|
|
|
|
}
|
|
|
|
|
|
|
|
func customDefaultsModuleFactory() android.Module {
|
|
|
|
m := customDefaultsModuleFactoryBase()
|
|
|
|
android.InitDefaultsModule(m)
|
|
|
|
return m
|
|
|
|
}
|
2020-12-14 14:25:34 +01:00
|
|
|
|
|
|
|
type customBazelModuleAttributes struct {
|
|
|
|
String_prop string
|
|
|
|
String_list_prop []string
|
2021-04-22 00:15:34 +02:00
|
|
|
Arch_paths bazel.LabelListAttribute
|
2020-12-14 14:25:34 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type customBazelModule struct {
|
|
|
|
android.BazelTargetModuleBase
|
|
|
|
customBazelModuleAttributes
|
|
|
|
}
|
|
|
|
|
|
|
|
func customBp2BuildMutator(ctx android.TopDownMutatorContext) {
|
|
|
|
if m, ok := ctx.Module().(*customModule); ok {
|
2021-03-10 08:05:59 +01:00
|
|
|
if !m.ConvertWithBp2build(ctx) {
|
2021-02-05 09:03:24 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2021-08-04 21:17:02 +02:00
|
|
|
paths := bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrcExcludes(ctx, m.props.Arch_paths, m.props.Arch_paths_exclude))
|
2021-04-22 00:15:34 +02:00
|
|
|
|
2021-05-21 14:37:59 +02:00
|
|
|
for axis, configToProps := range m.GetArchVariantProperties(ctx, &customProps{}) {
|
|
|
|
for config, props := range configToProps {
|
|
|
|
if archProps, ok := props.(*customProps); ok && archProps.Arch_paths != nil {
|
2021-08-04 21:17:02 +02:00
|
|
|
paths.SetSelectValue(axis, config, android.BazelLabelForModuleSrcExcludes(ctx, archProps.Arch_paths, archProps.Arch_paths_exclude))
|
2021-05-21 14:37:59 +02:00
|
|
|
}
|
2021-04-22 00:15:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-08-04 21:17:02 +02:00
|
|
|
paths.ResolveExcludes()
|
|
|
|
|
2021-02-05 09:01:50 +01:00
|
|
|
attrs := &customBazelModuleAttributes{
|
2020-12-14 14:25:34 +01:00
|
|
|
String_prop: m.props.String_prop,
|
|
|
|
String_list_prop: m.props.String_list_prop,
|
2021-04-22 00:15:34 +02:00
|
|
|
Arch_paths: paths,
|
2021-02-05 09:01:50 +01:00
|
|
|
}
|
|
|
|
|
2021-02-19 17:06:17 +01:00
|
|
|
props := bazel.BazelTargetModuleProperties{
|
|
|
|
Rule_class: "custom",
|
|
|
|
}
|
2021-02-05 09:01:50 +01:00
|
|
|
|
2021-08-11 06:17:36 +02:00
|
|
|
ctx.CreateBazelTargetModule(m.Name(), props, attrs)
|
2020-12-14 14:25:34 +01:00
|
|
|
}
|
|
|
|
}
|
2021-01-27 03:58:43 +01:00
|
|
|
|
|
|
|
// A bp2build mutator that uses load statements and creates a 1:M mapping from
|
|
|
|
// module to target.
|
|
|
|
func customBp2BuildMutatorFromStarlark(ctx android.TopDownMutatorContext) {
|
|
|
|
if m, ok := ctx.Module().(*customModule); ok {
|
2021-03-10 08:05:59 +01:00
|
|
|
if !m.ConvertWithBp2build(ctx) {
|
2021-02-05 09:03:24 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2021-02-05 09:01:50 +01:00
|
|
|
baseName := m.Name()
|
|
|
|
attrs := &customBazelModuleAttributes{}
|
|
|
|
|
2021-02-19 17:06:17 +01:00
|
|
|
myLibraryProps := bazel.BazelTargetModuleProperties{
|
|
|
|
Rule_class: "my_library",
|
|
|
|
Bzl_load_location: "//build/bazel/rules:rules.bzl",
|
|
|
|
}
|
2021-08-11 06:17:36 +02:00
|
|
|
ctx.CreateBazelTargetModule(baseName, myLibraryProps, attrs)
|
2021-02-19 17:06:17 +01:00
|
|
|
|
|
|
|
protoLibraryProps := bazel.BazelTargetModuleProperties{
|
|
|
|
Rule_class: "proto_library",
|
|
|
|
Bzl_load_location: "//build/bazel/rules:proto.bzl",
|
|
|
|
}
|
2021-08-11 06:17:36 +02:00
|
|
|
ctx.CreateBazelTargetModule(baseName+"_proto_library_deps", protoLibraryProps, attrs)
|
2021-02-19 17:06:17 +01:00
|
|
|
|
|
|
|
myProtoLibraryProps := bazel.BazelTargetModuleProperties{
|
|
|
|
Rule_class: "my_proto_library",
|
|
|
|
Bzl_load_location: "//build/bazel/rules:proto.bzl",
|
|
|
|
}
|
2021-08-11 06:17:36 +02:00
|
|
|
ctx.CreateBazelTargetModule(baseName+"_my_proto_library_deps", myProtoLibraryProps, attrs)
|
2021-01-27 03:58:43 +01:00
|
|
|
}
|
|
|
|
}
|
2021-02-22 16:19:34 +01:00
|
|
|
|
|
|
|
// Helper method for tests to easily access the targets in a dir.
|
2021-02-17 19:22:03 +01:00
|
|
|
func generateBazelTargetsForDir(codegenCtx *CodegenContext, dir string) BazelTargets {
|
2021-04-21 13:10:09 +02:00
|
|
|
// TODO: Set generateFilegroups to true and/or remove the generateFilegroups argument completely
|
2021-06-17 07:43:19 +02:00
|
|
|
buildFileToTargets, _, _ := GenerateBazelTargets(codegenCtx, false)
|
2021-02-22 16:19:34 +01:00
|
|
|
return buildFileToTargets[dir]
|
|
|
|
}
|
2021-08-04 21:17:02 +02:00
|
|
|
|
|
|
|
func registerCustomModuleForBp2buildConversion(ctx *android.TestContext) {
|
|
|
|
ctx.RegisterModuleType("custom", customModuleFactory)
|
|
|
|
ctx.RegisterBp2BuildMutator("custom", customBp2BuildMutator)
|
|
|
|
ctx.RegisterForBazelConversion()
|
|
|
|
}
|