diff options
| author | 2021-01-25 04:36:04 -0500 | |
|---|---|---|
| committer | 2021-01-25 04:46:07 -0500 | |
| commit | 288e2babde2525566b554e57b40ab9540887a5a6 (patch) | |
| tree | 2635c550ffd9426d509a6091af92c08464ab66fb /bp2build/bzl_conversion_test.go | |
| parent | f9be4e07e108eeea72acdbe3a08216f7744174d7 (diff) | |
queryview: prefix internal attribute names.
There's a module type in internal main that uses the module_deps
property, which clashes with QueryView's module_deps attribute. A fix is
to prefix the attribute as soong_module_deps to avoid the conflict.
While we're at this, rename the other internal attribute names to be
consistent as well.
Test: soong tests
Test: m queryview && bazel query //... --config=queryview
Fixes: 178351366
Change-Id: I84961c8f58c0c0fac1a1c2cbc6bc625499ac895e
Diffstat (limited to 'bp2build/bzl_conversion_test.go')
| -rw-r--r-- | bp2build/bzl_conversion_test.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bp2build/bzl_conversion_test.go b/bp2build/bzl_conversion_test.go index 01c727123..c1e660eb6 100644 --- a/bp2build/bzl_conversion_test.go +++ b/bp2build/bzl_conversion_test.go @@ -83,9 +83,9 @@ def _custom_impl(ctx): custom = rule( implementation = _custom_impl, attrs = { - "module_name": attr.string(mandatory = True), - "module_variant": attr.string(), - "module_deps": attr.label_list(providers = [SoongModuleInfo]), + "soong_module_name": attr.string(mandatory = True), + "soong_module_variant": attr.string(), + "soong_module_deps": attr.label_list(providers = [SoongModuleInfo]), "bool_prop": attr.bool(), "bool_ptr_prop": attr.bool(), "int64_ptr_prop": attr.int(), @@ -107,9 +107,9 @@ def _custom_defaults_impl(ctx): custom_defaults = rule( implementation = _custom_defaults_impl, attrs = { - "module_name": attr.string(mandatory = True), - "module_variant": attr.string(), - "module_deps": attr.label_list(providers = [SoongModuleInfo]), + "soong_module_name": attr.string(mandatory = True), + "soong_module_variant": attr.string(), + "soong_module_deps": attr.label_list(providers = [SoongModuleInfo]), "bool_prop": attr.bool(), "bool_ptr_prop": attr.bool(), "int64_ptr_prop": attr.int(), @@ -131,9 +131,9 @@ def _custom_test__impl(ctx): custom_test_ = rule( implementation = _custom_test__impl, attrs = { - "module_name": attr.string(mandatory = True), - "module_variant": attr.string(), - "module_deps": attr.label_list(providers = [SoongModuleInfo]), + "soong_module_name": attr.string(mandatory = True), + "soong_module_variant": attr.string(), + "soong_module_deps": attr.label_list(providers = [SoongModuleInfo]), "bool_prop": attr.bool(), "bool_ptr_prop": attr.bool(), "int64_ptr_prop": attr.int(), |