Skip to content

Commit

Permalink
delete incompatible_use_platforms_repo_for_constraints
Browse files Browse the repository at this point in the history
Fixes #16330

PiperOrigin-RevId: 560730031
Change-Id: I9eb2465559811dd9186940991105dcee202550cc
  • Loading branch information
Googler authored and Copybara-Service committed Aug 28, 2023
1 parent 73498b1 commit a7f7df3
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 252 deletions.
4 changes: 0 additions & 4 deletions scripts/bootstrap/compile.sh
Expand Up @@ -304,10 +304,6 @@ EOF
link_children "${PWD}" tools/python "${BAZEL_TOOLS_REPO}"
link_children "${PWD}" tools "${BAZEL_TOOLS_REPO}"

# Set up @bazel_tools//platforms properly
mkdir -p ${BAZEL_TOOLS_REPO}/platforms
cp tools/platforms/BUILD.tools ${BAZEL_TOOLS_REPO}/platforms/BUILD

# Set up @maven properly
cp maven/BUILD.vendor maven/BUILD

Expand Down
1 change: 0 additions & 1 deletion src/create_embedded_tools.py
Expand Up @@ -33,7 +33,6 @@
('*tools/build_defs/repo/BUILD.repo',
lambda x: 'tools/build_defs/repo/BUILD'),
('*tools/j2objc/BUILD.tools', lambda x: 'tools/j2objc/BUILD'),
('*tools/platforms/BUILD.tools', lambda x: 'platforms/BUILD'),
('*tools/platforms/*', lambda x: 'platforms/' + os.path.basename(x)),
('*tools/cpp/BUILD.tools', lambda x: 'tools/cpp/BUILD'),
('*tools/cpp/runfiles/generated_*',
Expand Down
Expand Up @@ -61,15 +61,6 @@ public static class BuildGraveyardOptions extends OptionsBase {
help = "Deprecated. No-op.")
public boolean skyframePrepareAnalysis;

@Option(
name = "incompatible_use_platforms_repo_for_constraints",
defaultValue = "true",
documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
help = "Deprecated no-op.")
public boolean usePlatformsRepoForConstraints;

@Option(
name = "experimental_replay_action_out_err",
defaultValue = "false",
Expand Down
33 changes: 0 additions & 33 deletions src/test/shell/bazel/platforms_test.sh
Expand Up @@ -73,39 +73,6 @@ EOF
fail "Bazel failed to build @platforms"
}

function test_incompatible_use_platforms_repo_for_constraints() {
# We test that a built-in @platforms repository is buildable.
bazel build --incompatible_use_platforms_repo_for_constraints @bazel_tools//platforms:all &> \
$TEST_log && fail "Build passed when we expected an error."
expect_log "Constraints from @bazel_tools//platforms have been removed."
}

function test_incompatible_use_platforms_repo_for_constraints_exec() {
# We test that a built-in @platforms repository is buildable.
cat > BUILD << 'EOF'
genrule(
name = "hello",
outs = ["hello.txt"],
cmd = "echo 'Hello' > $@",
tools = ["tool"],
)
genrule(
name = "tool",
outs = ["tool.sh"],
cmd = "touch $@",
target_compatible_with = select({
"@bazel_tools//platforms:linux": [],
"//conditions:default": [],
})
)
EOF

bazel build //:all &> \
$TEST_log && fail "Build passed when we expected an error."
expect_log "Constraints from @bazel_tools//platforms have been removed."
}

function test_platform_accessor() {
cat > rules.bzl <<'EOF'
def _impl(ctx):
Expand Down
2 changes: 0 additions & 2 deletions tools/BUILD
Expand Up @@ -24,7 +24,6 @@ filegroup(
"//tools/mini_tar:srcs",
"//tools/objc:srcs",
"//tools/osx:srcs",
"//tools/platforms:srcs",
"//tools/proto:srcs",
"//tools/python:srcs",
"//tools/runfiles:srcs",
Expand Down Expand Up @@ -59,7 +58,6 @@ filegroup(
"//tools/launcher:srcs",
"//tools/objc:srcs",
"//tools/osx:srcs",
"//tools/platforms:srcs",
"//tools/proto:srcs",
"//tools/python:embedded_tools",
"//tools/runfiles:embedded_tools",
Expand Down
107 changes: 0 additions & 107 deletions tools/platforms/BUILD

This file was deleted.

96 changes: 0 additions & 96 deletions tools/platforms/BUILD.tools

This file was deleted.

0 comments on commit a7f7df3

Please sign in to comment.