Automated rollback of commit f1c23cb216347437d0a190a23b9ecf46873db367. PiperOrigin-RevId: 971156077
diff --git a/MODULE.bazel b/MODULE.bazel index dab3a45..6f0620f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -25,10 +25,7 @@ bazel_dep(name = "zlib", version = "1.3.1.bcr.5") # other dependencies -proto_bazel_features = use_repo_rule("//bazel/private/oss:proto_bazel_features.bzl", "proto_bazel_features") - -proto_bazel_features(name = "proto_bazel_features") - +bazel_dep(name = "bazel_features", version = "1.33.0", repo_name = "proto_bazel_features") bazel_dep(name = "bazel_skylib", version = "1.9.0") bazel_dep(name = "jsoncpp", version = "1.9.6.bcr.2") bazel_dep(name = "rules_java", version = "8.6.1") @@ -346,58 +343,3 @@ jq = use_extension("@jq.bzl//jq:extensions.bzl", "toolchains", dev_dependency = True) use_repo(jq, "jq_toolchains") - -flag_alias( - name = "experimental_proto_descriptor_sets_include_source_info", - starlark_flag = "@//bazel/flags:experimental_proto_descriptor_sets_include_source_info", -) - -flag_alias( - name = "experimental_protoc_opts", - starlark_flag = "@//bazel/flags:protocopt", -) - -flag_alias( - name = "protocopt", - starlark_flag = "@//bazel/flags:protocopt", -) - -flag_alias( - name = "proto_compiler", - starlark_flag = "@//bazel/flags:proto_compiler", -) - -flag_alias( - name = "proto_toolchain_for_cc", - starlark_flag = "@//bazel/flags/cc:proto_toolchain_for_cc", -) - -flag_alias( - name = "proto_toolchain_for_java", - starlark_flag = "@//bazel/flags/java:proto_toolchain_for_java", -) - -flag_alias( - name = "proto_toolchain_for_javalite", - starlark_flag = "@//bazel/flags/java:proto_toolchain_for_javalite", -) - -flag_alias( - name = "strict_proto_deps", - starlark_flag = "@//bazel/flags:strict_proto_deps", -) - -flag_alias( - name = "strict_public_imports", - starlark_flag = "@//bazel/flags:strict_public_imports", -) - -flag_alias( - name = "cc_proto_library_header_suffixes", - starlark_flag = "@//bazel/flags/cc:cc_proto_library_header_suffixes", -) - -flag_alias( - name = "cc_proto_library_source_suffixes", - starlark_flag = "@//bazel/flags/cc:cc_proto_library_source_suffixes", -)
diff --git a/bazel/flags/BUILD b/bazel/flags/BUILD index 91d9a13..b801ea9 100644 --- a/bazel/flags/BUILD +++ b/bazel/flags/BUILD
@@ -1,6 +1,6 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") -load("//bazel/private:compat_flag.bzl", "compat_bool_flag", "compat_label_flag", "compat_string_list_flag") +load("//bazel/private:compat_flag.bzl", "compat_bool_flag", "compat_string_list_flag") package( default_applicable_licenses = ["//:license"], @@ -33,11 +33,9 @@ scope = "universal", ) -compat_label_flag( +label_flag( name = "proto_compiler", build_setting_default = "@bazel_tools//tools/proto:protoc", - executable = True, - fragment_field = "proto_compiler", ) compat_string_list_flag(
diff --git a/bazel/flags/cc/BUILD b/bazel/flags/cc/BUILD index a046b8d..697ad82 100644 --- a/bazel/flags/cc/BUILD +++ b/bazel/flags/cc/BUILD
@@ -1,6 +1,6 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") load("@rules_shell//shell:sh_binary.bzl", "sh_binary") -load("//bazel/private:compat_flag.bzl", "compat_label_flag", "compat_string_list_flag") +load("//bazel/private:compat_flag.bzl", "compat_string_list_flag") package( default_applicable_licenses = ["//:license"], @@ -9,10 +9,9 @@ exports_files(["BUILD"]) -compat_label_flag( +label_flag( name = "proto_toolchain_for_cc", build_setting_default = "@bazel_tools//tools/proto:cc_toolchain", - fragment_field = "proto_toolchain_for_cc", ) alias(
diff --git a/bazel/flags/java/BUILD b/bazel/flags/java/BUILD index 58911f1..c705982 100644 --- a/bazel/flags/java/BUILD +++ b/bazel/flags/java/BUILD
@@ -1,10 +1,7 @@ -load("//bazel/private:compat_flag.bzl", "compat_label_flag") - package( default_applicable_licenses = ["//:license"], default_visibility = [ "//bazel/private:__pkg__", - "//bazel/tests:__subpackages__", "//devtools/blaze/exoblaze/mac/integration:__subpackages__", "//devtools/blaze/integration:__subpackages__", ], @@ -14,14 +11,12 @@ ["BUILD"], ) -compat_label_flag( +label_flag( name = "proto_toolchain_for_java", build_setting_default = "@bazel_tools//tools/proto:java_toolchain", - fragment_field = "proto_toolchain_for_java", ) -compat_label_flag( +label_flag( name = "proto_toolchain_for_javalite", build_setting_default = "@bazel_tools//tools/proto:javalite_toolchain", - fragment_field = "proto_toolchain_for_javalite", )
diff --git a/bazel/private/compat_flag.bzl b/bazel/private/compat_flag.bzl index acabfe3..b9a5dd3 100644 --- a/bazel/private/compat_flag.bzl +++ b/bazel/private/compat_flag.bzl
@@ -7,10 +7,6 @@ """Helper rules and macros for custom proto flags.""" load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") -load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") -load("@rules_java//java/common:java_info.bzl", "JavaInfo") -load("@rules_java//java/common:proguard_spec_info.bzl", "ProguardSpecInfo") -load("//bazel/common:proto_lang_toolchain_info.bzl", "ProtoLangToolchainInfo") load("//bazel/private:native.bzl", "HAS_NATIVE_PROTO_FLAGS") def _compat_bool_rule_impl(ctx): @@ -95,21 +91,12 @@ def _compat_string_list_rule_impl(ctx): starlark_val = ctx.build_setting_value - - # 1. Starlark flag takes precedence if explicitly passed (not empty) if starlark_val: return [BuildSettingInfo(value = starlark_val)] - - # 2. Native flag fallback (if HAS_NATIVE_PROTO_FLAGS and present on ctx.fragments.proto) if HAS_NATIVE_PROTO_FLAGS and hasattr(ctx.fragments, "proto") and ctx.attr.fragment_field: if hasattr(ctx.fragments.proto, ctx.attr.fragment_field): val = getattr(ctx.fragments.proto, ctx.attr.fragment_field) - if type(val) == "list": - return [BuildSettingInfo(value = val)] - else: - return [BuildSettingInfo(value = val())] - - # 3. Default fallback + return [BuildSettingInfo(value = val)] return [BuildSettingInfo(value = ctx.attr.default_value)] _compat_string_list_rule = rule( @@ -146,147 +133,3 @@ default_value = default_vals, **kwargs ) - -def _forward_providers(ctx, label_val, target = None, extra_providers = []): - if target == None: - target = ctx.attr.default_value - providers = [BuildSettingInfo(value = label_val)] + extra_providers - if ProtoLangToolchainInfo in target: - providers.append(target[ProtoLangToolchainInfo]) - if target[ProtoLangToolchainInfo].runtime and JavaInfo in target[ProtoLangToolchainInfo].runtime: - providers.append(target[ProtoLangToolchainInfo].runtime[JavaInfo]) - if target[ProtoLangToolchainInfo].runtime and ProguardSpecInfo in target[ProtoLangToolchainInfo].runtime: - providers.append(target[ProtoLangToolchainInfo].runtime[ProguardSpecInfo]) - - if JavaInfo in target: - providers.append(target[JavaInfo]) - - if ProguardSpecInfo in target: - providers.append(target[ProguardSpecInfo]) - - if CcInfo in target: - providers.append(target[CcInfo]) - - return providers - -def _compat_label_rule_impl(ctx): - target = ctx.attr.default_value - label_val = target.label - - starlark_val = ctx.build_setting_value - - # 1. Starlark flag takes precedence if explicitly passed (not "default") - if starlark_val != "default": - label_val = Label(starlark_val) - - # 2. Native flag fallback (if HAS_NATIVE_PROTO_FLAGS and _native_target present on ctx.attr) - elif HAS_NATIVE_PROTO_FLAGS and hasattr(ctx.attr, "_native_target") and ctx.attr._native_target: - native_target = ctx.attr._native_target - if native_target.label != target.label: - target = native_target - label_val = native_target.label - - return _forward_providers(ctx, label_val, target = target) - -def _compat_executable_label_rule_impl(ctx): - target = ctx.attr.default_value - label_val = target.label - - starlark_val = ctx.build_setting_value - if starlark_val != "default": - label_val = Label(starlark_val) - elif HAS_NATIVE_PROTO_FLAGS and hasattr(ctx.attr, "_native_target") and ctx.attr._native_target: - native_target = ctx.attr._native_target - if native_target.label != target.label: - target = native_target - label_val = native_target.label - - extra_providers = [] - if DefaultInfo in target: - def_info = target[DefaultInfo] - if def_info.files_to_run and def_info.files_to_run.executable: - orig_exec = def_info.files_to_run.executable - symlink = ctx.actions.declare_file(orig_exec.basename) - ctx.actions.symlink( - output = symlink, - target_file = orig_exec, - is_executable = True, - ) - extra_providers.append(DefaultInfo( - files = depset([symlink]), - runfiles = def_info.default_runfiles, - executable = symlink, - )) - - return _forward_providers(ctx, label_val, target = target, extra_providers = extra_providers) - -_COMMON_LABEL_FLAG_ATTRS = { - "fragment_field": attr.string(), - "default_value": attr.label(), - "runtime": attr.label(), - "scope": attr.string(), -} - -def _make_label_rule(fragment_name, executable = False): - attrs = dict(_COMMON_LABEL_FLAG_ATTRS) - if HAS_NATIVE_PROTO_FLAGS and fragment_name: - attrs["_native_target"] = attr.label( - default = configuration_field(fragment = "proto", name = fragment_name), - ) - return rule( - implementation = _compat_executable_label_rule_impl if executable else _compat_label_rule_impl, - build_setting = config.string(flag = True), - executable = executable, - fragments = ["proto"] if HAS_NATIVE_PROTO_FLAGS and fragment_name else [], - attrs = attrs, - ) - -_compat_label_rule_compiler = _make_label_rule("proto_compiler", executable = False) -_compat_executable_label_rule_compiler = _make_label_rule("proto_compiler", executable = True) -_compat_label_rule_cc = _make_label_rule("proto_toolchain_for_cc", executable = False) -_compat_label_rule_java = _make_label_rule("proto_toolchain_for_java", executable = False) -_compat_label_rule_javalite = _make_label_rule("proto_toolchain_for_java_lite", executable = False) -_compat_label_rule_default = _make_label_rule(None, executable = False) -_compat_executable_label_rule_default = _make_label_rule(None, executable = True) - -_LABEL_RULES = { - ("proto_compiler", False): _compat_label_rule_compiler, - ("proto_compiler", True): _compat_executable_label_rule_compiler, - ("proto_toolchain_for_cc", False): _compat_label_rule_cc, - ("proto_toolchain_for_java", False): _compat_label_rule_java, - ("proto_toolchain_for_javalite", False): _compat_label_rule_javalite, - (None, False): _compat_label_rule_default, - (None, True): _compat_executable_label_rule_default, -} - -def compat_label_flag( - *, - name, - fragment_field = None, - build_setting_default = None, - executable = False, - **kwargs): - """Creates a custom label build setting reconciling Starlark/fragments. - - Args: - name: The target name for the Starlark build setting flag. - fragment_field: The field name in ctx.fragments.proto, if any. - build_setting_default: Fallback default label target. - executable: Whether the label setting points to an executable target. - **kwargs: Additional rule arguments (such as `scope`). - """ - if fragment_field != None and (fragment_field, executable) not in _LABEL_RULES: - fail("Unsupported fragment_field '%s' for compat_label_flag. Supported values are: %s" % ( - fragment_field, - sorted([k[0] for k in _LABEL_RULES.keys() if k[0] != None]), - )) - - rule_func = _LABEL_RULES.get((fragment_field, executable), _LABEL_RULES[(None, executable)]) - rule_func( - name = name, - build_setting_default = "default", - fragment_field = fragment_field or "", - default_value = build_setting_default, - runtime = build_setting_default, - **kwargs - )
diff --git a/bazel/private/java_proto_library.bzl b/bazel/private/java_proto_library.bzl index f731656..b5cdb6e 100644 --- a/bazel/private/java_proto_library.bzl +++ b/bazel/private/java_proto_library.bzl
@@ -74,7 +74,7 @@ attrs = ( toolchains.if_legacy_toolchain({ "_aspect_java_proto_toolchain": attr.label( - default = Label("//bazel/flags/java:proto_toolchain_for_java"), + default = "//bazel/flags/java:proto_toolchain_for_java", ), }) ), @@ -161,7 +161,7 @@ "licenses": attr.license() if hasattr(attr, "license") else attr.string_list(), } | toolchains.if_legacy_toolchain({ "_aspect_java_proto_toolchain": attr.label( - default = Label("//bazel/flags/java:proto_toolchain_for_java"), + default = "//bazel/flags/java:proto_toolchain_for_java", ), }), # buildifier: disable=attr-licenses (attribute called licenses) provides = [JavaInfo],
diff --git a/bazel/private/native.bzl b/bazel/private/native.bzl index 90e4dea..e76864b 100644 --- a/bazel/private/native.bzl +++ b/bazel/private/native.bzl
@@ -1,6 +1,4 @@ """Renames toplevel symbols so they can be exported in Starlark under the same name""" -load("@proto_bazel_features//:features.bzl", "bazel_features") - -native_proto_common = getattr(native, "proto_common", None) -HAS_NATIVE_PROTO_FLAGS = bazel_features.rules.has_proto_fragment +native_proto_common = proto_common_do_not_use +HAS_NATIVE_PROTO_FLAGS = True
diff --git a/bazel/private/oss/cc_proto_library.bzl b/bazel/private/oss/cc_proto_library.bzl index 19eb705..b18fe19 100644 --- a/bazel/private/oss/cc_proto_library.bzl +++ b/bazel/private/oss/cc_proto_library.bzl
@@ -193,7 +193,7 @@ ), } | toolchains.if_legacy_toolchain({ "_proto_toolchain_for_cc": attr.label( - default = Label("//bazel/flags/cc:proto_toolchain_for_cc"), + default = "//bazel/flags/cc:proto_toolchain_for_cc", ), }), provides = [CcInfo],
diff --git a/bazel/private/oss/proto_bazel_features.bzl b/bazel/private/oss/proto_bazel_features.bzl index d25a166..37efd40 100644 --- a/bazel/private/oss/proto_bazel_features.bzl +++ b/bazel/private/oss/proto_bazel_features.bzl
@@ -16,7 +16,6 @@ ), rules = struct( analysis_tests_can_transition_on_experimental_incompatible_flags = {analysis_tests_can_transition_on_experimental_incompatible_flags}, - has_proto_fragment = {has_proto_fragment}, ), globals = struct( PackageSpecificationInfo = {PackageSpecificationInfo}, @@ -41,7 +40,6 @@ protobuf_on_allowlist = major_version_int > 7 ProtoInfo = "ProtoInfo" if major_version_int < 8 else "None" cc_proto_aspect = "cc_proto_aspect" if major_version_int < 8 else "None" - has_proto_fragment = major_version_int < 9 rctx.file("BUILD.bazel", """ load("@bazel_skylib//:bzl_library.bzl", "bzl_library") @@ -60,7 +58,6 @@ cc_proto_aspect = cc_proto_aspect, analysis_tests_can_transition_on_experimental_incompatible_flags = "True" if major_version_int > 8 or (major_version_int == 8 and minor_version_int >= 2) else "False", - has_proto_fragment = repr(has_proto_fragment), )) proto_bazel_features = repository_rule(
diff --git a/bazel/private/proto_lang_toolchain_rule.bzl b/bazel/private/proto_lang_toolchain_rule.bzl index 2e2fa5e..00492b7 100644 --- a/bazel/private/proto_lang_toolchain_rule.bzl +++ b/bazel/private/proto_lang_toolchain_rule.bzl
@@ -150,14 +150,14 @@ executable = True, ), "_protocopt": attr.label( - default = Label("//bazel/flags:protocopt"), + default = "//bazel/flags:protocopt", ), } | ({} if proto_common.INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION else { "_proto_compiler": attr.label( cfg = "exec", executable = True, allow_files = True, - default = Label("//bazel/flags:proto_compiler"), + default = "//bazel/flags:proto_compiler", ), }), provides = [ProtoLangToolchainInfo],
diff --git a/bazel/private/proto_library_rule.bzl b/bazel/private/proto_library_rule.bzl index 700afb2..b26389d 100644 --- a/bazel/private/proto_library_rule.bzl +++ b/bazel/private/proto_library_rule.bzl
@@ -386,20 +386,20 @@ # buildifier: disable=attr-license (calling attr.license()) "licenses": attr.license() if hasattr(attr, "license") else attr.string_list(), "_experimental_proto_descriptor_sets_include_source_info": attr.label( - default = Label("//bazel/flags:experimental_proto_descriptor_sets_include_source_info"), + default = "//bazel/flags:experimental_proto_descriptor_sets_include_source_info", ), "_strict_proto_deps": attr.label( - default = Label("//bazel/flags:strict_proto_deps"), + default = "//bazel/flags:strict_proto_deps", ), "_strict_public_imports": attr.label( - default = Label("//bazel/flags:strict_public_imports"), + default = "//bazel/flags:strict_public_imports", ), } | toolchains.if_legacy_toolchain({ "_proto_compiler": attr.label( cfg = "exec", executable = True, allow_files = True, - default = Label("//src/google/protobuf/compiler:protoc_minimal"), + default = "//src/google/protobuf/compiler:protoc_minimal", ), }), # buildifier: disable=attr-licenses (attribute called licenses) fragments = [
diff --git a/bazel/tests/bazel_proto_library_tests.bzl b/bazel/tests/bazel_proto_library_tests.bzl index b8487d6..4694a28 100644 --- a/bazel/tests/bazel_proto_library_tests.bzl +++ b/bazel/tests/bazel_proto_library_tests.bzl
@@ -669,10 +669,7 @@ name = name, target = name + "_a_proto", impl = _test_experimental_proto_descriptor_sets_include_source_info_impl, - config_settings = { - "//command_line_option:experimental_proto_descriptor_sets_include_source_info": "true", - "@@//bazel/flags:experimental_proto_descriptor_sets_include_source_info": "true", - }, + config_settings = {"@@//bazel/flags:experimental_proto_descriptor_sets_include_source_info": "true"}, ) def _test_experimental_proto_descriptor_sets_include_source_info_impl(env, target):
diff --git a/bazel/tests/proto_common_compile_tests.bzl b/bazel/tests/proto_common_compile_tests.bzl index 65889bc..368aa25 100644 --- a/bazel/tests/proto_common_compile_tests.bzl +++ b/bazel/tests/proto_common_compile_tests.bzl
@@ -7,13 +7,11 @@ # """Tests for `proto_common.compile` function.""" -load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") load("@rules_testing//lib:truth.bzl", "matching") load("@rules_testing//lib:util.bzl", "util") load("//bazel:proto_library.bzl", "proto_library") load("//bazel/tests/testdata:compile_rule.bzl", "compile_rule") -load("//bazel/toolchains:proto_lang_toolchain.bzl", "proto_lang_toolchain") protocol_compiler = "/protoc" @@ -36,18 +34,9 @@ _test_compile_additional_inputs, _test_compile_resource_set, _test_compile_protoc_opts, - _test_compile_protoc_opts_starlark, _test_compile_direct_generated_protos, _test_compile_indirect_generated_protos, _test_compile_override_progress_message, - _test_proto_compiler_flag_override, - _test_proto_compiler_native_flag_override, - _test_proto_toolchain_for_cc_flag_override, - _test_proto_toolchain_for_cc_native_flag_override, - _test_proto_toolchain_for_java_flag_override, - _test_proto_toolchain_for_java_native_flag_override, - _test_proto_toolchain_for_javalite_flag_override, - _test_proto_toolchain_for_javalite_native_flag_override, ], ) @@ -302,25 +291,7 @@ analysis_test( name = name, target = name + "_compile", - config_settings = { - "//command_line_option:protocopt": ["--foo", "--bar"], - }, - impl = _test_compile_protoc_opts_impl, - ) - -def _test_compile_protoc_opts_starlark(name): - util.helper_target( - compile_rule, - name = name + "_compile", - proto_dep = ":simple_proto", - ) - - analysis_test( - name = name, - target = name + "_compile", - config_settings = { - "@@//bazel/flags:protocopt": ["--foo", "--bar"], - }, + config_settings = {"//command_line_option:protocopt": ["--foo", "--bar"]}, impl = _test_compile_protoc_opts_impl, ) @@ -422,185 +393,3 @@ def _test_compile_override_progress_message_impl(env, target): action = env.expect.that_target(target).action_named("MyMnemonic") env.expect.that_str(repr(action.actual)).contains("My custom progress message //") - -def _dummy_compiler_impl(ctx): - exe = ctx.actions.declare_file(ctx.label.name) - ctx.actions.write(exe, "#!/bin/sh\nexit 0\n", is_executable = True) - return [DefaultInfo(executable = exe, files = depset([exe]))] - -_dummy_compiler = rule( - implementation = _dummy_compiler_impl, - executable = True, -) - -def _test_proto_compiler_flag_override(name): - util.helper_target( - _dummy_compiler, - name = name + "_custom_compiler", - ) - - analysis_test( - name = name, - target = "@//bazel/flags:proto_compiler", - impl = _test_proto_compiler_flag_override_impl, - config_settings = { - "@@//bazel/flags:proto_compiler": "//bazel/tests:" + name + "_custom_compiler", - }, - ) - -def _test_proto_compiler_flag_override_impl(env, target): - env.expect.that_target(target).has_provider(BuildSettingInfo) - val = target[BuildSettingInfo].value - env.expect.that_str(str(val)).contains("_custom_compiler") - -def _test_proto_compiler_native_flag_override(name): - util.helper_target( - _dummy_compiler, - name = name + "_custom_compiler_native", - ) - - analysis_test( - name = name, - target = "@//bazel/flags:proto_compiler", - impl = _test_proto_compiler_native_flag_override_impl, - config_settings = { - "//command_line_option:proto_compiler": str(Label("//bazel/tests:" + name + "_custom_compiler_native")), - }, - ) - -def _test_proto_compiler_native_flag_override_impl(env, target): - env.expect.that_target(target).has_provider(BuildSettingInfo) - val = target[BuildSettingInfo].value - env.expect.that_str(str(val)).contains("_custom_compiler_native") - -def _test_proto_toolchain_for_cc_flag_override(name): - util.helper_target( - proto_lang_toolchain, - name = name + "_custom_cc_toolchain", - command_line = "$(OUT)", - mnemonic = "CustomCcMnemonic", - ) - - analysis_test( - name = name, - target = "@//bazel/flags/cc:proto_toolchain_for_cc", - impl = _test_proto_toolchain_for_cc_flag_override_impl, - config_settings = { - "@@//bazel/flags/cc:proto_toolchain_for_cc": "//bazel/tests:" + name + "_custom_cc_toolchain", - }, - ) - -def _test_proto_toolchain_for_cc_flag_override_impl(env, target): - env.expect.that_target(target).has_provider(BuildSettingInfo) - val = target[BuildSettingInfo].value - env.expect.that_str(str(val)).contains("_custom_cc_toolchain") - -def _test_proto_toolchain_for_cc_native_flag_override(name): - util.helper_target( - proto_lang_toolchain, - name = name + "_custom_cc_toolchain_native", - command_line = "$(OUT)", - mnemonic = "CustomCcMnemonicNative", - ) - - analysis_test( - name = name, - target = "@//bazel/flags/cc:proto_toolchain_for_cc", - impl = _test_proto_toolchain_for_cc_native_flag_override_impl, - config_settings = { - "//command_line_option:proto_toolchain_for_cc": str(Label("//bazel/tests:" + name + "_custom_cc_toolchain_native")), - }, - ) - -def _test_proto_toolchain_for_cc_native_flag_override_impl(env, target): - env.expect.that_target(target).has_provider(BuildSettingInfo) - val = target[BuildSettingInfo].value - env.expect.that_str(str(val)).contains("_custom_cc_toolchain_native") - -def _test_proto_toolchain_for_java_flag_override(name): - util.helper_target( - proto_lang_toolchain, - name = name + "_custom_java_toolchain", - command_line = "$(OUT)", - mnemonic = "CustomJavaMnemonic", - ) - - analysis_test( - name = name, - target = "@//bazel/flags/java:proto_toolchain_for_java", - impl = _test_proto_toolchain_for_java_flag_override_impl, - config_settings = { - "@@//bazel/flags/java:proto_toolchain_for_java": "//bazel/tests:" + name + "_custom_java_toolchain", - }, - ) - -def _test_proto_toolchain_for_java_flag_override_impl(env, target): - env.expect.that_target(target).has_provider(BuildSettingInfo) - val = target[BuildSettingInfo].value - env.expect.that_str(str(val)).contains("_custom_java_toolchain") - -def _test_proto_toolchain_for_java_native_flag_override(name): - util.helper_target( - proto_lang_toolchain, - name = name + "_custom_java_toolchain_native", - command_line = "$(OUT)", - mnemonic = "CustomJavaMnemonicNative", - ) - - analysis_test( - name = name, - target = "@//bazel/flags/java:proto_toolchain_for_java", - impl = _test_proto_toolchain_for_java_native_flag_override_impl, - config_settings = { - "//command_line_option:proto_toolchain_for_java": str(Label("//bazel/tests:" + name + "_custom_java_toolchain_native")), - }, - ) - -def _test_proto_toolchain_for_java_native_flag_override_impl(env, target): - env.expect.that_target(target).has_provider(BuildSettingInfo) - val = target[BuildSettingInfo].value - env.expect.that_str(str(val)).contains("_custom_java_toolchain_native") - -def _test_proto_toolchain_for_javalite_flag_override(name): - util.helper_target( - proto_lang_toolchain, - name = name + "_custom_javalite_toolchain", - command_line = "$(OUT)", - mnemonic = "CustomJavaLiteMnemonic", - ) - - analysis_test( - name = name, - target = "@//bazel/flags/java:proto_toolchain_for_javalite", - impl = _test_proto_toolchain_for_javalite_flag_override_impl, - config_settings = { - "@@//bazel/flags/java:proto_toolchain_for_javalite": "//bazel/tests:" + name + "_custom_javalite_toolchain", - }, - ) - -def _test_proto_toolchain_for_javalite_flag_override_impl(env, target): - env.expect.that_target(target).has_provider(BuildSettingInfo) - val = target[BuildSettingInfo].value - env.expect.that_str(str(val)).contains("_custom_javalite_toolchain") - -def _test_proto_toolchain_for_javalite_native_flag_override(name): - util.helper_target( - proto_lang_toolchain, - name = name + "_custom_javalite_toolchain_native", - command_line = "$(OUT)", - mnemonic = "CustomJavaLiteMnemonicNative", - ) - - analysis_test( - name = name, - target = "@//bazel/flags/java:proto_toolchain_for_javalite", - impl = _test_proto_toolchain_for_javalite_native_flag_override_impl, - config_settings = { - "//command_line_option:proto_toolchain_for_javalite": str(Label("//bazel/tests:" + name + "_custom_javalite_toolchain_native")), - }, - ) - -def _test_proto_toolchain_for_javalite_native_flag_override_impl(env, target): - env.expect.that_target(target).has_provider(BuildSettingInfo) - val = target[BuildSettingInfo].value - env.expect.that_str(str(val)).contains("_custom_javalite_toolchain_native")
diff --git a/cmake/dependencies_generator.py b/cmake/dependencies_generator.py index cd5677b..332146c 100644 --- a/cmake/dependencies_generator.py +++ b/cmake/dependencies_generator.py
@@ -87,9 +87,6 @@ def register_toolchains(self, *args, **kwargs): pass - def flag_alias(self, *args, **kwargs): - pass - def use_repo(self, *args, **kwargs): pass