tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "queryview: prefix internal attribute names."

Browse source
This commit is contained in:
Jingwen Chen 2021-01-25 22:18:32 +00:00 committed by Gerrit Code Review
commit 467f8b6c46
4 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
bp2build/androidbp_to_build_templates.go
View file

@ -25,10 +25,10 @@ load("//build/bazel/queryview_rules:soong_module.bzl", "soong_module")
// for expanding more attributes. // for expanding more attributes.
soongModuleTarget = `soong_module( soongModuleTarget = `soong_module(
name = "%s", name = "%s",
module_name = "%s", soong_module_name = "%s",
module_type = "%s", soong_module_type = "%s",
module_variant = "%s", soong_module_variant = "%s",
module_deps = %s, soong_module_deps = %s,
%s)` %s)`
bazelTarget = `%s( bazelTarget = `%s(
@ -38,7 +38,7 @@ load("//build/bazel/queryview_rules:soong_module.bzl", "soong_module")
// A simple provider to mark and differentiate Soong module rule shims from // A simple provider to mark and differentiate Soong module rule shims from
// regular Bazel rules. Every Soong module rule shim returns a // regular Bazel rules. Every Soong module rule shim returns a
// SoongModuleInfo provider, and can only depend on rules returning // SoongModuleInfo provider, and can only depend on rules returning
// SoongModuleInfo in the `module_deps` attribute. // SoongModuleInfo in the `soong_module_deps` attribute.
providersBzl = `SoongModuleInfo = provider( providersBzl = `SoongModuleInfo = provider(
fields = { fields = {
"name": "Name of module", "name": "Name of module",
@ -57,19 +57,19 @@ load("//build/bazel/queryview_rules:providers.bzl", "SoongModuleInfo")
def _generic_soong_module_impl(ctx): def _generic_soong_module_impl(ctx):
return [ return [
SoongModuleInfo( SoongModuleInfo(
name = ctx.attr.module_name, name = ctx.attr.soong_module_name,
type = ctx.attr.module_type, type = ctx.attr.soong_module_type,
variant = ctx.attr.module_variant, variant = ctx.attr.soong_module_variant,
), ),
] ]
generic_soong_module = rule( generic_soong_module = rule(
implementation = _generic_soong_module_impl, implementation = _generic_soong_module_impl,
attrs = { attrs = {
"module_name": attr.string(mandatory = True), "soong_module_name": attr.string(mandatory = True),
"module_type": attr.string(mandatory = True), "soong_module_type": attr.string(mandatory = True),
"module_variant": attr.string(), "soong_module_variant": attr.string(),
"module_deps": attr.label_list(providers = [SoongModuleInfo]), "soong_module_deps": attr.label_list(providers = [SoongModuleInfo]),
}, },
) )
@ -89,20 +89,20 @@ def _is_supported_type(value):
else: else:
return False return False
# soong_module is a macro that supports arbitrary kwargs, and uses module_type to # soong_module is a macro that supports arbitrary kwargs, and uses soong_module_type to
# expand to the right underlying shim. # expand to the right underlying shim.
def soong_module(name, module_type, **kwargs): def soong_module(name, soong_module_type, **kwargs):
soong_module_rule = soong_module_rule_map.get(module_type) soong_module_rule = soong_module_rule_map.get(soong_module_type)
if soong_module_rule == None: if soong_module_rule == None:
# This module type does not have an existing rule to map to, so use the # This module type does not have an existing rule to map to, so use the
# generic_soong_module rule instead. # generic_soong_module rule instead.
generic_soong_module( generic_soong_module(
name = name, name = name,
module_type = module_type, soong_module_type = soong_module_type,
module_name = kwargs.pop("module_name", ""), soong_module_name = kwargs.pop("soong_module_name", ""),
module_variant = kwargs.pop("module_variant", ""), soong_module_variant = kwargs.pop("soong_module_variant", ""),
module_deps = kwargs.pop("module_deps", []), soong_module_deps = kwargs.pop("soong_module_deps", []),
) )
else: else:
supported_kwargs = dict() supported_kwargs = dict()

56
bp2build/build_conversion_test.go
View file

@ -31,10 +31,10 @@ func TestGenerateSoongModuleTargets(t *testing.T) {
`, `,
expectedBazelTarget: `soong_module( expectedBazelTarget: `soong_module(
name = "foo", name = "foo",
module_name = "foo", soong_module_name = "foo",
module_type = "custom", soong_module_type = "custom",
module_variant = "", soong_module_variant = "",
module_deps = [ soong_module_deps = [
], ],
)`, )`,
}, },
@ -46,10 +46,10 @@ func TestGenerateSoongModuleTargets(t *testing.T) {
`, `,
expectedBazelTarget: `soong_module( expectedBazelTarget: `soong_module(
name = "foo", name = "foo",
module_name = "foo", soong_module_name = "foo",
module_type = "custom", soong_module_type = "custom",
module_variant = "", soong_module_variant = "",
module_deps = [ soong_module_deps = [
], ],
ramdisk = True, ramdisk = True,
)`, )`,
@ -62,10 +62,10 @@ func TestGenerateSoongModuleTargets(t *testing.T) {
`, `,
expectedBazelTarget: `soong_module( expectedBazelTarget: `soong_module(
name = "foo", name = "foo",
module_name = "foo", soong_module_name = "foo",
module_type = "custom", soong_module_type = "custom",
module_variant = "", soong_module_variant = "",
module_deps = [ soong_module_deps = [
], ],
owner = "a_string_with\"quotes\"_and_\\backslashes\\\\", owner = "a_string_with\"quotes\"_and_\\backslashes\\\\",
)`, )`,
@ -78,10 +78,10 @@ func TestGenerateSoongModuleTargets(t *testing.T) {
`, `,
expectedBazelTarget: `soong_module( expectedBazelTarget: `soong_module(
name = "foo", name = "foo",
module_name = "foo", soong_module_name = "foo",
module_type = "custom", soong_module_type = "custom",
module_variant = "", soong_module_variant = "",
module_deps = [ soong_module_deps = [
], ],
required = [ required = [
"bar", "bar",
@ -96,10 +96,10 @@ func TestGenerateSoongModuleTargets(t *testing.T) {
`, `,
expectedBazelTarget: `soong_module( expectedBazelTarget: `soong_module(
name = "foo", name = "foo",
module_name = "foo", soong_module_name = "foo",
module_type = "custom", soong_module_type = "custom",
module_variant = "", soong_module_variant = "",
module_deps = [ soong_module_deps = [
], ],
target_required = [ target_required = [
"qux", "qux",
@ -124,10 +124,10 @@ func TestGenerateSoongModuleTargets(t *testing.T) {
`, `,
expectedBazelTarget: `soong_module( expectedBazelTarget: `soong_module(
name = "foo", name = "foo",
module_name = "foo", soong_module_name = "foo",
module_type = "custom", soong_module_type = "custom",
module_variant = "", soong_module_variant = "",
module_deps = [ soong_module_deps = [
], ],
dist = { dist = {
"tag": ".foo", "tag": ".foo",
@ -162,10 +162,10 @@ func TestGenerateSoongModuleTargets(t *testing.T) {
`, `,
expectedBazelTarget: `soong_module( expectedBazelTarget: `soong_module(
name = "foo", name = "foo",
module_name = "foo", soong_module_name = "foo",
module_type = "custom", soong_module_type = "custom",
module_variant = "", soong_module_variant = "",
module_deps = [ soong_module_deps = [
], ],
dists = [ dists = [
{ {

6
bp2build/bzl_conversion.go
View file

@ -109,9 +109,9 @@ func generateRules(moduleTypeFactories map[string]android.ModuleFactory) map[str
factoryName := runtime.FuncForPC(reflect.ValueOf(factory).Pointer()).Name() factoryName := runtime.FuncForPC(reflect.ValueOf(factory).Pointer()).Name()
pkg := strings.Split(factoryName, ".")[0] pkg := strings.Split(factoryName, ".")[0]
attrs := `{ attrs := `{
"module_name": attr.string(mandatory = True), "soong_module_name": attr.string(mandatory = True),
"module_variant": attr.string(), "soong_module_variant": attr.string(),
"module_deps": attr.label_list(providers = [SoongModuleInfo]), "soong_module_deps": attr.label_list(providers = [SoongModuleInfo]),
` `
attrs += getAttributes(factory) attrs += getAttributes(factory)
attrs += " }," attrs += " },"

18
bp2build/bzl_conversion_test.go
View file

@ -83,9 +83,9 @@ def _custom_impl(ctx):
custom = rule( custom = rule(
implementation = _custom_impl, implementation = _custom_impl,
attrs = { attrs = {
"module_name": attr.string(mandatory = True), "soong_module_name": attr.string(mandatory = True),
"module_variant": attr.string(), "soong_module_variant": attr.string(),
"module_deps": attr.label_list(providers = [SoongModuleInfo]), "soong_module_deps": attr.label_list(providers = [SoongModuleInfo]),
"bool_prop": attr.bool(), "bool_prop": attr.bool(),
"bool_ptr_prop": attr.bool(), "bool_ptr_prop": attr.bool(),
"int64_ptr_prop": attr.int(), "int64_ptr_prop": attr.int(),
@ -107,9 +107,9 @@ def _custom_defaults_impl(ctx):
custom_defaults = rule( custom_defaults = rule(
implementation = _custom_defaults_impl, implementation = _custom_defaults_impl,
attrs = { attrs = {
"module_name": attr.string(mandatory = True), "soong_module_name": attr.string(mandatory = True),
"module_variant": attr.string(), "soong_module_variant": attr.string(),
"module_deps": attr.label_list(providers = [SoongModuleInfo]), "soong_module_deps": attr.label_list(providers = [SoongModuleInfo]),
"bool_prop": attr.bool(), "bool_prop": attr.bool(),
"bool_ptr_prop": attr.bool(), "bool_ptr_prop": attr.bool(),
"int64_ptr_prop": attr.int(), "int64_ptr_prop": attr.int(),
@ -131,9 +131,9 @@ def _custom_test__impl(ctx):
custom_test_ = rule( custom_test_ = rule(
implementation = _custom_test__impl, implementation = _custom_test__impl,
attrs = { attrs = {
"module_name": attr.string(mandatory = True), "soong_module_name": attr.string(mandatory = True),
"module_variant": attr.string(), "soong_module_variant": attr.string(),
"module_deps": attr.label_list(providers = [SoongModuleInfo]), "soong_module_deps": attr.label_list(providers = [SoongModuleInfo]),
"bool_prop": attr.bool(), "bool_prop": attr.bool(),
"bool_ptr_prop": attr.bool(), "bool_ptr_prop": attr.bool(),
"int64_ptr_prop": attr.int(), "int64_ptr_prop": attr.int(),