Remove the flag `incompatible_disallow_native_in_build_file`
https://github.com/bazelbuild/bazel/issues/7513
RELNOTES: None.
PiperOrigin-RevId: 253062497
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index f6aa4b6..219b3be 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -1665,9 +1665,6 @@
"error getting package_name or repository_name functions from the native module",
exception);
}
- if (!pkgEnv.getSemantics().incompatibleDisallowNativeInBuildFile()) {
- pkgEnv.setup("native", nativeModule);
- }
pkgEnv
.setup("distribs", newDistribsFunction.apply(context))
.setup("glob", newGlobFunction.apply(context))
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index 939711f..2d7691d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -311,20 +311,6 @@
public boolean incompatibleDisallowLoadLabelsToCrossPackageBoundaries;
@Option(
- name = "incompatible_disallow_native_in_build_file",
- defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
- effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
- metadataTags = {
- OptionMetadataTag.INCOMPATIBLE_CHANGE,
- OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
- },
- help =
- "If set to true, the native module is not accessible in BUILD files. "
- + "Use for example `cc_library` instead of `native.cc_library`.")
- public boolean incompatibleDisallowNativeInBuildFile;
-
- @Option(
name = "incompatible_disallow_rule_execution_platform_constraints_allowed",
defaultValue = "False",
documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
@@ -623,7 +609,6 @@
.incompatibleDisallowLegacyJavaProvider(incompatibleDisallowLegacyJavaProvider)
.incompatibleDisallowLoadLabelsToCrossPackageBoundaries(
incompatibleDisallowLoadLabelsToCrossPackageBoundaries)
- .incompatibleDisallowNativeInBuildFile(incompatibleDisallowNativeInBuildFile)
.incompatibleDisallowOldStyleArgsAdd(incompatibleDisallowOldStyleArgsAdd)
.incompatibleDisallowStructProviderSyntax(incompatibleDisallowStructProviderSyntax)
.incompatibleDisallowRuleExecutionPlatformConstraintsAllowed(
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index cd4f402..dcabe4b 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -161,8 +161,6 @@
public abstract boolean incompatibleDisallowLoadLabelsToCrossPackageBoundaries();
- public abstract boolean incompatibleDisallowNativeInBuildFile();
-
public abstract boolean incompatibleDisallowOldStyleArgsAdd();
public abstract boolean incompatibleDisallowRuleExecutionPlatformConstraintsAllowed();
@@ -252,7 +250,6 @@
.incompatibleDisallowLegacyJavaProvider(false)
.incompatibleDisallowLegacyJavaInfo(false)
.incompatibleDisallowLoadLabelsToCrossPackageBoundaries(true)
- .incompatibleDisallowNativeInBuildFile(true)
.incompatibleDisallowOldStyleArgsAdd(true)
.incompatibleDisallowRuleExecutionPlatformConstraintsAllowed(false)
.incompatibleDisallowStructProviderSyntax(false)
@@ -322,8 +319,6 @@
public abstract Builder incompatibleDisallowOldStyleArgsAdd(boolean value);
- public abstract Builder incompatibleDisallowNativeInBuildFile(boolean value);
-
public abstract Builder incompatibleDisallowRuleExecutionPlatformConstraintsAllowed(
boolean value);
diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
index be4f723..93a65ba 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
@@ -809,25 +809,10 @@
}
@Test
- public void testNativeModuleIsAvailable() throws Exception {
- Path buildFile = scratch.file("/pkg/BUILD", "native.cc_library(name='bar')");
- Package pkg =
- packages.createPackage(
- "pkg",
- RootedPath.toRootedPath(root, buildFile),
- "--incompatible_disallow_native_in_build_file=false");
- assertThat(pkg.containsErrors()).isFalse();
- }
-
- @Test
public void testNativeModuleIsDisabled() throws Exception {
events.setFailFast(false);
Path buildFile = scratch.file("/pkg/BUILD", "native.cc_library(name='bar')");
- Package pkg =
- packages.createPackage(
- "pkg",
- RootedPath.toRootedPath(root, buildFile),
- "--incompatible_disallow_native_in_build_file=true");
+ Package pkg = packages.createPackage("pkg", RootedPath.toRootedPath(root, buildFile));
assertThat(pkg.containsErrors()).isTrue();
}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
index a7d4a66..b7e6bba 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
@@ -145,7 +145,6 @@
"--incompatible_disallow_legacy_javainfo=" + rand.nextBoolean(),
"--incompatible_disallow_legacy_java_provider=" + rand.nextBoolean(),
"--incompatible_disallow_load_labels_to_cross_package_boundaries=" + rand.nextBoolean(),
- "--incompatible_disallow_native_in_build_file=" + rand.nextBoolean(),
"--incompatible_disallow_old_style_args_add=" + rand.nextBoolean(),
"--incompatible_disallow_struct_provider_syntax=" + rand.nextBoolean(),
"--incompatible_disallow_rule_execution_platform_constraints_allowed=" + rand.nextBoolean(),
@@ -197,7 +196,6 @@
.incompatibleDisallowLegacyJavaInfo(rand.nextBoolean())
.incompatibleDisallowLegacyJavaProvider(rand.nextBoolean())
.incompatibleDisallowLoadLabelsToCrossPackageBoundaries(rand.nextBoolean())
- .incompatibleDisallowNativeInBuildFile(rand.nextBoolean())
.incompatibleDisallowOldStyleArgsAdd(rand.nextBoolean())
.incompatibleDisallowStructProviderSyntax(rand.nextBoolean())
.incompatibleDisallowRuleExecutionPlatformConstraintsAllowed(rand.nextBoolean())
