diff --git a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java index c8e2da487dbbf9..ef7d397510e5f3 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java +++ b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java @@ -415,7 +415,7 @@ public final class BuildLanguageOptions extends OptionsBase { @Option( name = "incompatible_no_implicit_file_export", - defaultValue = "false", + defaultValue = FlagConstants.DEFAULT_INCOMPATIBLE_NO_IMPLICIT_FILE_EXPORT, documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, @@ -1061,7 +1061,7 @@ public FlagConsumer setBool(String key, boolean ignored) { "-incompatible_java_info_merge_runtime_module_flags"; public static final String INCOMPATIBLE_NO_ATTR_LICENSE = "+incompatible_no_attr_license"; public static final String INCOMPATIBLE_NO_IMPLICIT_FILE_EXPORT = - "-incompatible_no_implicit_file_export"; + FlagConstants.DEFAULT_INCOMPATIBLE_NO_IMPLICIT_FILE_EXPORT_NAME; public static final String INCOMPATIBLE_NO_RULE_OUTPUTS_PARAM = "-incompatible_no_rule_outputs_param"; public static final String INCOMPATIBLE_RUN_SHELL_COMMAND_STRING = diff --git a/src/main/java/com/google/devtools/build/lib/packages/semantics/FlagConstants.java b/src/main/java/com/google/devtools/build/lib/packages/semantics/FlagConstants.java index 41290e2a637a9e..6c38ea18187351 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/semantics/FlagConstants.java +++ b/src/main/java/com/google/devtools/build/lib/packages/semantics/FlagConstants.java @@ -45,4 +45,8 @@ private FlagConstants() {} public static final String DEFAULT_INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION = "true"; public static final String DEFAULT_INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION_NAME = "+incompatible_enable_proto_toolchain_resolution"; + + public static final String DEFAULT_INCOMPATIBLE_NO_IMPLICIT_FILE_EXPORT = "true"; + public static final String DEFAULT_INCOMPATIBLE_NO_IMPLICIT_FILE_EXPORT_NAME = + "+incompatible_no_implicit_file_export"; } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 931b5cc6b04d05..9a8075025198ef 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -193,6 +193,11 @@ def _impl(ctx): runtime_deps = [":proguard_import"], ) +alias( + name = "proguard_whitelister", + actual = ":proguard_allowlister.par", +) + java_import( name = "TestRunner", jars = ["TestRunner.jar"], diff --git a/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java b/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java index 902c1849d49c29..069832af295d0e 100644 --- a/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java +++ b/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java @@ -1522,7 +1522,7 @@ public void testDefaultVisibilityReturnedInDepsForInputFiles() throws Exception writeFile("mango/BUILD", "package_group(name='mango', packages=[])"); Set result = eval("deps(//kiwi:kiwi.sh)"); - assertThat(result).isEqualTo(eval("//mango:mango + //kiwi:kiwi.sh")); + assertThat(result).isEqualTo(eval("//kiwi:kiwi.sh")); } // Regression test for bug #2827101: diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java index 5b6ad0bdd74ae1..5629271b4b302a 100755 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java @@ -5968,6 +5968,7 @@ private static void createFiles( "load('//" + bzlFilePath + ":extension.bzl', 'cc_starlark_library')", "load('@rules_cc//cc:cc_binary.bzl', 'cc_binary')", "load('@rules_cc//cc:cc_library.bzl', 'cc_library')", + "exports_files(['script.lds', 'extra_compiler_input'])", "cc_library(", " name = 'dep1',", " srcs = ['dep1.cc'],", diff --git a/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java index 3666486e936ff8..e21f8c8dbb99f4 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/filegroup/FilegroupConfiguredTargetTest.java @@ -83,6 +83,7 @@ private void writeTest() throws IOException { scratch.file( "another/BUILD", """ + exports_files(['another.txt']) filegroup(name = 'another', srcs = ['another.txt']) """); diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/PyBinaryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/python/PyBinaryConfiguredTargetTest.java index 23a442f51d2cc2..2f629d6c1a6a01 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/python/PyBinaryConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/python/PyBinaryConfiguredTargetTest.java @@ -95,6 +95,7 @@ public void defaultMainCannotBeAmbiguous() throws Exception { scratch.file( "pkg1/BUILD", getPyLoad("py_binary"), + "exports_files(['bar.py'])", "py_binary(", " name = 'foo',", " srcs = ['bar.py'])"); @@ -115,6 +116,7 @@ public void explicitMainCannotBeAmbiguous() throws Exception { scratch.file( "pkg1/BUILD", getPyLoad("py_binary"), + "exports_files(['bar.py'])", "py_binary(", " name = 'foo',", " srcs = ['bar.py'])"); diff --git a/src/test/py/bazel/bzlmod/bazel_module_test.py b/src/test/py/bazel/bzlmod/bazel_module_test.py index afbab5ab22bb56..586ff0910149d6 100644 --- a/src/test/py/bazel/bzlmod/bazel_module_test.py +++ b/src/test/py/bazel/bzlmod/bazel_module_test.py @@ -65,6 +65,9 @@ def setUp(self): 'build' ' --extra_toolchains=@bazel_tools//tools/python:autodetecting_toolchain' ), + # TODO: Remove once rules_python exports runtime_env_toolchain_interpreter.sh + # See https://github.com/bazel-contrib/rules_python/pull/3471 + 'build --noincompatible_no_implicit_file_export', ], ) diff --git a/src/test/py/bazel/bzlmod/bazel_repo_mapping_test.py b/src/test/py/bazel/bzlmod/bazel_repo_mapping_test.py index 238641490ec4ab..ac0d829432d054 100644 --- a/src/test/py/bazel/bzlmod/bazel_repo_mapping_test.py +++ b/src/test/py/bazel/bzlmod/bazel_repo_mapping_test.py @@ -56,6 +56,9 @@ def setUp(self): 'build' ' --extra_toolchains=@bazel_tools//tools/python:autodetecting_toolchain' ), + # TODO: Remove once rules_python exports runtime_env_toolchain_interpreter.sh + # See https://github.com/bazel-contrib/rules_python/pull/3471 + 'build --noincompatible_no_implicit_file_export', ], ) diff --git a/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh b/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh index 831a7ac7f181e6..e7e7afc4757d1f 100755 --- a/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh +++ b/src/test/shell/bazel/bazel_bootstrap_distfile_test.sh @@ -87,6 +87,10 @@ function test_bootstrap() { JAVABASE=$(echo reduced*) + # TODO: Remove once rules_python exports runtime_env_toolchain_interpreter.sh + # See https://github.com/bazel-contrib/rules_python/pull/3471 + export EXTRA_BAZEL_ARGS="${EXTRA_BAZEL_ARGS:-} --noincompatible_no_implicit_file_export" + ./compile.sh || fail "Expected to be able to bootstrap bazel.\ If you updated MODULE.bazel, see the NOTE in that file." @@ -134,6 +138,7 @@ EOF --java_runtime_version=local_jdk --tool_java_runtime_version=local_jdk \ --extra_toolchains=@rules_python//python/runtime_env_toolchains:all \ --extra_toolchains=fake_java_toolchain:all \ + --noincompatible_no_implicit_file_export \ src:bazel_nojdk &> "${TEST_log}" || fail "analysis with bootstrapped Bazel failed" } diff --git a/src/test/shell/bazel/bazel_determinism_test.sh b/src/test/shell/bazel/bazel_determinism_test.sh index 4df3348c771009..17a693fb1eab29 100755 --- a/src/test/shell/bazel/bazel_determinism_test.sh +++ b/src/test/shell/bazel/bazel_determinism_test.sh @@ -84,10 +84,13 @@ function test_determinism() { else output_base_1="${TEST_TMPDIR}/ouäöü€t 1" fi + # TODO: Remove once rules_python exports runtime_env_toolchain_interpreter.sh + # See https://github.com/bazel-contrib/rules_python/pull/3471 bazel \ --output_base="${output_base_1}" \ build \ --extra_toolchains=@rules_python//python:autodetecting_toolchain \ + --noincompatible_no_implicit_file_export \ --enable_bzlmod \ --check_direct_dependencies=error \ --lockfile_mode=update \ @@ -112,6 +115,7 @@ function test_determinism() { --output_base="${output_base_2}" \ build \ --extra_toolchains=@rules_python//python:autodetecting_toolchain \ + --noincompatible_no_implicit_file_export \ --enable_bzlmod \ --check_direct_dependencies=error \ --lockfile_mode=update \