Automatic code cleanup. PiperOrigin-RevId: 247478487
diff --git a/src/test/shell/bazel/cc_api_rules.bzl b/src/test/shell/bazel/cc_api_rules.bzl index 87d9949..201b0a7 100644 --- a/src/test/shell/bazel/cc_api_rules.bzl +++ b/src/test/shell/bazel/cc_api_rules.bzl
@@ -26,7 +26,6 @@ def _cc_lib_impl(ctx): cc_toolchain = find_cpp_toolchain(ctx) feature_configuration = cc_common.configure_features( - ctx = ctx, cc_toolchain = cc_toolchain, requested_features = ctx.features, unsupported_features = ctx.disabled_features, @@ -106,7 +105,6 @@ def _cc_bin_impl(ctx): cc_toolchain = find_cpp_toolchain(ctx) feature_configuration = cc_common.configure_features( - ctx = ctx, cc_toolchain = cc_toolchain, requested_features = ctx.features, unsupported_features = ctx.disabled_features,
diff --git a/src/test/shell/integration/execution_phase_tests.sh b/src/test/shell/integration/execution_phase_tests.sh index 17b6c7b..3ff596e 100755 --- a/src/test/shell/integration/execution_phase_tests.sh +++ b/src/test/shell/integration/execution_phase_tests.sh
@@ -25,14 +25,14 @@ export RUNFILES_MANIFEST_FILE="$TEST_SRCDIR/MANIFEST" elif [[ -f "$0.runfiles/MANIFEST" ]]; then export RUNFILES_MANIFEST_FILE="$0.runfiles/MANIFEST" - elif [[ -f "$TEST_SRCDIR/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then + elif [[ -f "$TEST_SRCDIR/io_bazel/tools/bash/runfiles/runfiles.bash" ]]; then export RUNFILES_DIR="$TEST_SRCDIR" fi fi -if [[ -f "${RUNFILES_DIR:-/dev/null}/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then - source "${RUNFILES_DIR}/bazel_tools/tools/bash/runfiles/runfiles.bash" +if [[ -f "${RUNFILES_DIR:-/dev/null}/io_bazel/tools/bash/runfiles/runfiles.bash" ]]; then + source "${RUNFILES_DIR}/io_bazel/tools/bash/runfiles/runfiles.bash" elif [[ -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then - source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \ + source "$(grep -m1 "^io_bazel/tools/bash/runfiles/runfiles.bash " \ "$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)" else echo >&2 "ERROR: cannot find //third_party/bazel/tools/bash/runfiles:runfiles.bash"
diff --git a/tools/cpp/cc_flags_supplier.bzl b/tools/cpp/cc_flags_supplier.bzl index af01c18..418aa28 100644 --- a/tools/cpp/cc_flags_supplier.bzl +++ b/tools/cpp/cc_flags_supplier.bzl
@@ -31,5 +31,4 @@ "_cc_toolchain": attr.label(default = Label("@bazel_tools//tools/cpp:current_cc_toolchain")), }, toolchains = ["@bazel_tools//tools/cpp:toolchain_type"], - fragments = ["cpp"], )
diff --git a/tools/cpp/cc_flags_supplier_lib.bzl b/tools/cpp/cc_flags_supplier_lib.bzl index 042ecef..a179fbf 100644 --- a/tools/cpp/cc_flags_supplier_lib.bzl +++ b/tools/cpp/cc_flags_supplier_lib.bzl
@@ -55,7 +55,6 @@ def _from_features(ctx, cc_toolchain, action_name): feature_configuration = cc_common.configure_features( - ctx = ctx, cc_toolchain = cc_toolchain, requested_features = ctx.features, unsupported_features = ctx.disabled_features,