Skip to content

Commit

Permalink
Automated rollback of commit 8241d27.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Breaks tests [GOOGLE] testing head Blaze against the depot which hasn't been migrated yet.

*** Original change description ***

Flip the --incompatible_disallow_native_in_build_file flag

Fixes bazelbuild#7513

RELNOTES[INC]: The "native" module is no longer available in BUILD files, all its members can be accessed directly as global symbols. This can be temporarily reverted by providing --incompatible_disallow_native_in_build_file=false as a flag to Blaze.

PiperOrigin-RevId: 249639134
  • Loading branch information
aragos authored and irengrig committed Jul 15, 2019
1 parent b713fac commit 129e185
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl

@Option(
name = "incompatible_disallow_native_in_build_file",
defaultValue = "true",
defaultValue = "false",
documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public static Builder builderWithDefaults() {
.incompatibleDisallowLegacyJavaProvider(false)
.incompatibleDisallowLegacyJavaInfo(false)
.incompatibleDisallowLoadLabelsToCrossPackageBoundaries(true)
.incompatibleDisallowNativeInBuildFile(true)
.incompatibleDisallowNativeInBuildFile(false)
.incompatibleDisallowOldStyleArgsAdd(true)
.incompatibleDisallowRuleExecutionPlatformConstraintsAllowed(false)
.incompatibleDisallowStructProviderSyntax(false)
Expand Down
2 changes: 1 addition & 1 deletion src/test/shell/bazel/local_repository_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@ genrule(
name = 'b',
srcs = [],
outs = ['bo'],
cmd = 'echo ' + repository_name() + ' ' + package_name() + ' > $@')
cmd = 'echo ' + native.repository_name() + ' ' + native.package_name() + ' > $@')
EOF

cat > WORKSPACE <<EOF
Expand Down

0 comments on commit 129e185

Please sign in to comment.