Clean up Windows config_settings

1.Deleted config_setting for --cpu=x64_windows_msys, because we don't build
  Bazel with MSYS gcc anymore.

2.Deleted config_setting for --cpu=x64_windows_msvc, because it uses exactly
  the same toolchain as --cpu=x64_windows, it'll be removed in the future.

This change reduces the complexity of our BUILD files and make them less
confusing.

Change-Id: I939831a6861413b0f745fb1be98aacd4fb780e0a
PiperOrigin-RevId: 181751853

21 files changed, 1 insertions, 173 deletions

diff --git a/src/BUILD b/src/BUILD
index 9fbbc4785f..119e19b099 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -11,8 +11,6 @@ filegroup(
         "//src/conditions:darwin": ["//src/main/native:libunix.dylib"],
         "//src/conditions:darwin_x86_64": ["//src/main/native:libunix.dylib"],
         "//src/conditions:windows": ["//src/main/native/windows:windows_jni.dll"],
-        "//src/conditions:windows_msys": ["//src/main/native/windows:windows_jni.dll"],
-        "//src/conditions:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
         "//conditions:default": ["//src/main/native:libunix.so"],
     }),
     visibility = [
@@ -189,16 +187,6 @@ py_binary(
             "//src/tools/launcher:launcher",
             "//third_party/def_parser:def_parser",
         ],
-        "//src/conditions:windows_msys": [
-            "//src/java_tools/singlejar:SingleJar_deploy.jar",
-            "//src/tools/launcher:launcher",
-            "//third_party/def_parser:def_parser",
-        ],
-        "//src/conditions:windows_msvc": [
-            "//src/java_tools/singlejar:SingleJar_deploy.jar",
-            "//src/tools/launcher:launcher",
-            "//third_party/def_parser:def_parser",
-        ],
         "//src/conditions:arm": [
             "//src/java_tools/singlejar:SingleJar_deploy.jar",
         ],
@@ -212,12 +200,6 @@ py_binary(
         "//src/conditions:darwin_x86_64": [
             "@openjdk_macos//file",
         ],
-        "//src/conditions:windows_msys": [
-            "@openjdk_win//file",
-        ],
-        "//src/conditions:windows_msvc": [
-            "@openjdk_win//file",
-        ],
         "//src/conditions:windows": [
             "@openjdk_win//file",
         ],
@@ -438,10 +420,3 @@ alias(
     actual = "//src/conditions:windows",
     visibility = ["//visibility:public"],
 )
-
-# config_setting alias left here because bazel-only third_party code is pointing to it
-alias(
-    name = "windows_msvc",
-    actual = "//src/conditions:windows_msvc",
-    visibility = ["//visibility:public"],
-)
diff --git a/src/conditions/BUILD b/src/conditions/BUILD
index 9853f1f8c4..11d0cbfb17 100644
--- a/src/conditions/BUILD
+++ b/src/conditions/BUILD
@@ -47,18 +47,6 @@ config_setting(
 )
 
 config_setting(
-    name = "windows_msvc",
-    values = {"cpu": "x64_windows_msvc"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "windows_msys",
-    values = {"cpu": "x64_windows_msys"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
     name = "arm",
     values = {"cpu": "arm"},
     visibility = ["//visibility:public"],
diff --git a/src/main/cpp/BUILD b/src/main/cpp/BUILD
index 052b01a32e..82b7859e90 100644
--- a/src/main/cpp/BUILD
+++ b/src/main/cpp/BUILD
@@ -33,12 +33,6 @@ cc_library(
         "//src/conditions:windows": [
             "blaze_util_windows.cc",
         ],
-        "//src/conditions:windows_msys": [
-            "blaze_util_windows.cc",
-        ],
-        "//src/conditions:windows_msvc": [
-            "blaze_util_windows.cc",
-        ],
         "//conditions:default": [
             "blaze_util_linux.cc",
             "blaze_util_posix.cc",
@@ -58,7 +52,6 @@ cc_library(
         "//src/conditions:freebsd": [
         ],
         "//src/conditions:windows": WIN_LINK_OPTS,
-        "//src/conditions:windows_msvc": WIN_LINK_OPTS,
         "//conditions:default": [
             "-lrt",
         ],
@@ -68,8 +61,6 @@ cc_library(
         "//src/main/cpp/util:blaze_exit_code",
     ] + select({
         "//src/conditions:windows": ["//src/main/native/windows:lib-file"],
-        "//src/conditions:windows_msys": ["//src/main/native/windows:lib-file"],
-        "//src/conditions:windows_msvc": ["//src/main/native/windows:lib-file"],
         "//conditions:default": [],
     }),
 )
@@ -84,12 +75,10 @@ cc_binary(
         "main.cc",
     ] + select({
         "//src/conditions:windows": ["//src/main/native/windows:resources.o"],
-        "//src/conditions:windows_msvc": ["//src/main/native/windows:resources.o"],
         "//conditions:default": [],
     }),
     copts = select({
         "//src/conditions:windows": ["/wd4018"],
-        "//src/conditions:windows_msvc": ["/wd4018"],
         "//conditions:default": ["-Wno-sign-compare"],
     }),
     linkopts = select({
@@ -101,7 +90,7 @@ cc_binary(
             "-lprocstat",
             "-lm",
         ],
-        "//src/conditions:windows_msvc": [
+        "//src/conditions:windows": [
         ],
         "//conditions:default": [
             "-lrt",
diff --git a/src/main/cpp/util/BUILD b/src/main/cpp/util/BUILD
index 4dd12cdbc8..0c97a045e5 100644
--- a/src/main/cpp/util/BUILD
+++ b/src/main/cpp/util/BUILD
@@ -35,12 +35,6 @@ cc_library(
         "//src/conditions:windows": [
             "file_windows.cc",
         ],
-        "//src/conditions:windows_msys": [
-            "file_windows.cc",
-        ],
-        "//src/conditions:windows_msvc": [
-            "file_windows.cc",
-        ],
         "//conditions:default": [
             "file_posix.cc",
         ],
@@ -62,8 +56,6 @@ cc_library(
         ":strings",
     ] + select({
         "//src/conditions:windows": ["//src/main/native/windows:lib-file"],
-        "//src/conditions:windows_msys": ["//src/main/native/windows:lib-file"],
-        "//src/conditions:windows_msvc": ["//src/main/native/windows:lib-file"],
         "//conditions:default": [],
     }),
 )
@@ -72,8 +64,6 @@ cc_library(
     name = "errors",
     srcs = ["errors.cc"] + select({
         "//src/conditions:windows": ["errors_windows.cc"],
-        "//src/conditions:windows_msys": ["errors_windows.cc"],
-        "//src/conditions:windows_msvc": ["errors_windows.cc"],
         "//conditions:default": ["errors_posix.cc"],
     }),
     hdrs = ["errors.h"],
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index ee1d54818f..5f5ff0a255 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -79,8 +79,6 @@ java_library(
     resources = select({
         # todo(dslomov): Get rid of this whole library on Windows.
         "//src/conditions:windows": [],
-        "//src/conditions:windows_msys": [],
-        "//src/conditions:windows_msvc": [],
         "//conditions:default": ["//src/main/native:libunix.so"],
     }),
     deps = [
diff --git a/src/main/native/BUILD b/src/main/native/BUILD
index ea7038524a..c65b29c7a2 100644
--- a/src/main/native/BUILD
+++ b/src/main/native/BUILD
@@ -5,7 +5,6 @@ genrule(
         "//src/conditions:darwin_x86_64": ["//tools/jdk:jni_md_header-darwin"],
         "//src/conditions:freebsd": ["//tools/jdk:jni_md_header-freebsd"],
         "//src/conditions:windows": ["//tools/jdk:jni_md_header-windows"],
-        "//src/conditions:windows_msvc": ["//tools/jdk:jni_md_header-windows"],
         "//conditions:default": ["//tools/jdk:jni_md_header-linux"],
     }),
     outs = ["jni_md.h"],
diff --git a/src/main/tools/BUILD b/src/main/tools/BUILD
index b6250a20d4..e96155302d 100644
--- a/src/main/tools/BUILD
+++ b/src/main/tools/BUILD
@@ -20,7 +20,6 @@ cc_binary(
     name = "process-wrapper",
     srcs = select({
         "//src/conditions:windows": ["process-wrapper-windows.cc"],
-        "//src/conditions:windows_msvc": ["process-wrapper-windows.cc"],
         "//conditions:default": [
             "process-wrapper.cc",
             "process-wrapper.h",
@@ -33,7 +32,6 @@ cc_binary(
     linkopts = ["-lm"],
     deps = select({
         "//src/conditions:windows": [],
-        "//src/conditions:windows_msvc": [],
         "//conditions:default": [
             ":process-tools",
             ":logging",
@@ -45,7 +43,6 @@ cc_binary(
     name = "build-runfiles",
     srcs = select({
         "//src/conditions:windows": ["build-runfiles-windows.cc"],
-        "//src/conditions:windows_msvc": ["build-runfiles-windows.cc"],
         "//conditions:default": ["build-runfiles.cc"],
     }),
 )
@@ -57,8 +54,6 @@ cc_binary(
         "//src/conditions:darwin_x86_64": ["dummy-sandbox.c"],
         "//src/conditions:freebsd": ["dummy-sandbox.c"],
         "//src/conditions:windows": ["dummy-sandbox.c"],
-        "//src/conditions:windows_msys": ["dummy-sandbox.c"],
-        "//src/conditions:windows_msvc": ["dummy-sandbox.c"],
         "//conditions:default": [
             "linux-sandbox.cc",
             "linux-sandbox.h",
@@ -74,8 +69,6 @@ cc_binary(
         "//src/conditions:darwin_x86_64": [],
         "//src/conditions:freebsd": [],
         "//src/conditions:windows": [],
-        "//src/conditions:windows_msys": [],
-        "//src/conditions:windows_msvc": [],
         "//conditions:default": [
             ":logging",
             ":process-tools",
diff --git a/src/main/tools/jdk.BUILD b/src/main/tools/jdk.BUILD
index 6726e0424f..48df3b6e7e 100644
--- a/src/main/tools/jdk.BUILD
+++ b/src/main/tools/jdk.BUILD
@@ -29,8 +29,6 @@ filegroup(
     name = "java",
     srcs = select({
        ":windows" : ["bin/java.exe"],
-       ":windows_msys" : ["bin/java.exe"],
-       ":windows_msvc" : ["bin/java.exe"],
        "//conditions:default" : ["bin/java"],
     }),
     data = [":jdk"],
@@ -40,8 +38,6 @@ filegroup(
     name = "jar",
     srcs = select({
        ":windows" : ["bin/jar.exe"],
-       ":windows_msys" : ["bin/jar.exe"],
-       ":windows_msvc" : ["bin/jar.exe"],
        "//conditions:default" : ["bin/jar"],
     }),
     data = [":jdk"],
@@ -51,8 +47,6 @@ filegroup(
     name = "javac",
     srcs = select({
         ":windows" : ["bin/javac.exe"],
-        ":windows_msys" : ["bin/javac.exe"],
-        ":windows_msvc" : ["bin/javac.exe"],
         "//conditions:default" : ["bin/javac"],
     }),
     data = [":jdk"],
@@ -101,8 +95,6 @@ filegroup(
         # common antivirus software blocks access to npjp2.dll interfering with Bazel,
         # so do not include it in JRE on Windows.
         ":windows" : glob(["jre/bin/**"], exclude = ["jre/bin/plugin2/**"]),
-        ":windows_msys" : glob(["jre/bin/**"], exclude = ["jre/bin/plugin2/**"]),
-        ":windows_msvc" : glob(["jre/bin/**"], exclude = ["jre/bin/plugin2/**"]),
         "//conditions:default" : glob(["jre/bin/**"])
     }),
 )
@@ -182,14 +174,3 @@ config_setting(
     visibility = ["//visibility:private"],
 )
 
-config_setting(
-    name = "windows_msys",
-    values = {"cpu": "x64_windows_msys"},
-    visibility = ["//visibility:private"],
-)
-
-config_setting(
-    name = "windows_msvc",
-    values = {"cpu": "x64_windows_msvc"},
-    visibility = ["//visibility:private"],
-)
diff --git a/src/test/cpp/BUILD b/src/test/cpp/BUILD
index 1f58e4dc74..a436556554 100644
--- a/src/test/cpp/BUILD
+++ b/src/test/cpp/BUILD
@@ -14,13 +14,6 @@ cc_test(
         "//src/conditions:windows": [
             "blaze_util_windows_test.cc",
         ],
-        "//src/conditions:windows_msys": [
-            "blaze_util_test.cc",
-            "blaze_util_windows_test.cc",
-        ],
-        "//src/conditions:windows_msvc": [
-            "blaze_util_windows_test.cc",
-        ],
         "//conditions:default": [
             "blaze_util_test.cc",
             "blaze_util_posix_test.cc",
diff --git a/src/test/cpp/util/BUILD b/src/test/cpp/util/BUILD
index 91b1ef0357..1ddd8235fb 100644
--- a/src/test/cpp/util/BUILD
+++ b/src/test/cpp/util/BUILD
@@ -25,12 +25,6 @@ cc_test(
         "//src/conditions:windows": [
             "file_windows_test.cc",
         ],
-        "//src/conditions:windows_msys": [
-            "file_windows_test.cc",
-        ],
-        "//src/conditions:windows_msvc": [
-            "file_windows_test.cc",
-        ],
         "//conditions:default": [
             "file_posix_test.cc",
         ],
@@ -44,14 +38,6 @@ cc_test(
             ":windows_test_util",
             "//src/main/native/windows:lib-file",
         ],
-        "//src/conditions:windows_msys": [
-            ":windows_test_util",
-            "//src/main/native/windows:lib-file",
-        ],
-        "//src/conditions:windows_msvc": [
-            ":windows_test_util",
-            "//src/main/native/windows:lib-file",
-        ],
         "//conditions:default": [],
     }),
 )
@@ -91,14 +77,10 @@ cc_library(
     testonly = 1,
     srcs = select({
         "//src/conditions:windows": ["windows_test_util.cc"],
-        "//src/conditions:windows_msys": ["windows_test_util.cc"],
-        "//src/conditions:windows_msvc": ["windows_test_util.cc"],
         "//conditions:default": [],
     }),
     hdrs = select({
         "//src/conditions:windows": ["windows_test_util.h"],
-        "//src/conditions:windows_msys": ["windows_test_util.h"],
-        "//src/conditions:windows_msvc": ["windows_test_util.h"],
         "//conditions:default": [],
     }),
     visibility = [
@@ -112,8 +94,6 @@ cc_test(
     size = "small",
     srcs = select({
         "//src/conditions:windows": ["windows_test_util_test.cc"],
-        "//src/conditions:windows_msys": ["windows_test_util_test.cc"],
-        "//src/conditions:windows_msvc": ["windows_test_util_test.cc"],
         "//conditions:default": ["dummy_test.cc"],
     }),
     deps = select({
@@ -121,14 +101,6 @@ cc_test(
             ":windows_test_util",
             "//third_party:gtest",
         ],
-        "//src/conditions:windows_msys": [
-            ":windows_test_util",
-            "//third_party:gtest",
-        ],
-        "//src/conditions:windows_msvc": [
-            ":windows_test_util",
-            "//third_party:gtest",
-        ],
         "//conditions:default": [],
     }),
 )
diff --git a/src/test/java/com/google/devtools/build/android/junctions/BUILD b/src/test/java/com/google/devtools/build/android/junctions/BUILD
index 727dc02b70..e5cb0c68cc 100644
--- a/src/test/java/com/google/devtools/build/android/junctions/BUILD
+++ b/src/test/java/com/google/devtools/build/android/junctions/BUILD
@@ -15,14 +15,10 @@ java_test(
     size = "small",
     srcs = select({
         "//src/conditions:windows": ["WindowsJunctionCreatorTest.java"],
-        "//src/conditions:windows_msvc": ["WindowsJunctionCreatorTest.java"],
-        "//src/conditions:windows_msys": ["WindowsJunctionCreatorTest.java"],
         "//conditions:default": ["NoopJunctionCreatorTest.java"],
     }),
     test_class = select({
         "//src/conditions:windows": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest",
-        "//src/conditions:windows_msvc": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest",
-        "//src/conditions:windows_msys": "com.google.devtools.build.android.junctions.WindowsJunctionCreatorTest",
         "//conditions:default": "com.google.devtools.build.android.junctions.NoopJunctionCreatorTest",
     }),
     deps = [
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 4998afcb9e..473513fd93 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -27,8 +27,6 @@ ALL_WINDOWS_TESTS = CROSS_PLATFORM_WINDOWS_TESTS + WINDOWS_ON_WINDOWS_TESTS
 
 JNI_LIB = select({
     "//src/conditions:windows": ["//src/main/native/windows:windows_jni.dll"],
-    "//src/conditions:windows_msys": ["//src/main/native/windows:windows_jni.dll"],
-    "//src/conditions:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
     "//conditions:default": [
         "//src/main/native:libunix.dylib",
         "//src/main/native:libunix.so",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
index 8c7437ee3b..49a0cae53a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD
@@ -14,8 +14,6 @@ java_test(
     name = "RepositoryTests",
     srcs = select({
         "//src/conditions:windows": [":RepositoryTests_windows_srcs"],
-        "//src/conditions:windows_msys": [":RepositoryTests_windows_srcs"],
-        "//src/conditions:windows_msvc": [":RepositoryTests_windows_srcs"],
         "//conditions:default": glob(["*.java"]),
     }),
     data = ["test_decompress_archive.tar.gz"],
diff --git a/src/test/native/BUILD b/src/test/native/BUILD
index 3934fd5e1f..587f9ed352 100644
--- a/src/test/native/BUILD
+++ b/src/test/native/BUILD
@@ -16,14 +16,6 @@ cc_test(
             "windows/util_test.cc",
             "windows/file_test.cc",
         ],
-        "//src/conditions:windows_msys": [
-            "windows/util_test.cc",
-            "windows/file_test.cc",
-        ],
-        "//src/conditions:windows_msvc": [
-            "windows/util_test.cc",
-            "windows/file_test.cc",
-        ],
         "//conditions:default": ["dummy_test.cc"],
     }),
     deps = select({
@@ -32,16 +24,6 @@ cc_test(
             "//src/test/cpp/util:windows_test_util",
             "//third_party:gtest",
         ],
-        "//src/conditions:windows_msys": [
-            "//src/main/native/windows:lib-file",
-            "//src/test/cpp/util:windows_test_util",
-            "//third_party:gtest",
-        ],
-        "//src/conditions:windows_msvc": [
-            "//src/main/native/windows:lib-file",
-            "//src/test/cpp/util:windows_test_util",
-            "//third_party:gtest",
-        ],
         "//conditions:default": [],
     }),
 )
diff --git a/src/test/py/bazel/BUILD b/src/test/py/bazel/BUILD
index 9b989ef53e..ad1d726f79 100644
--- a/src/test/py/bazel/BUILD
+++ b/src/test/py/bazel/BUILD
@@ -65,20 +65,14 @@ py_test(
     size = "medium",
     srcs = select({
         "//src/conditions:windows": ["bazel_windows_test.py"],
-        "//src/conditions:windows_msvc": ["bazel_windows_test.py"],
-        "//src/conditions:windows_msys": ["bazel_windows_test.py"],
         "//conditions:default": ["empty_test.py"],
     }),
     main = select({
         "//src/conditions:windows": "bazel_windows_test.py",
-        "//src/conditions:windows_msvc": "bazel_windows_test.py",
-        "//src/conditions:windows_msys": "bazel_windows_test.py",
         "//conditions:default": "empty_test.py",
     }),
     deps = select({
         "//src/conditions:windows": [":test_base"],
-        "//src/conditions:windows_msvc": [":test_base"],
-        "//src/conditions:windows_msys": [":test_base"],
         "//conditions:default": [],
     }),
 )
@@ -101,20 +95,14 @@ py_test(
     size = "large",
     srcs = select({
         "//src/conditions:windows": ["bazel_windows_cpp_test.py"],
-        "//src/conditions:windows_msvc": ["bazel_windows_cpp_test.py"],
-        "//src/conditions:windows_msys": ["bazel_windows_cpp_test.py"],
         "//conditions:default": ["empty_test.py"],
     }),
     main = select({
         "//src/conditions:windows": "bazel_windows_cpp_test.py",
-        "//src/conditions:windows_msvc": "bazel_windows_cpp_test.py",
-        "//src/conditions:windows_msys": "bazel_windows_cpp_test.py",
         "//conditions:default": "empty_test.py",
     }),
     deps = select({
         "//src/conditions:windows": [":test_base"],
-        "//src/conditions:windows_msvc": [":test_base"],
-        "//src/conditions:windows_msys": [":test_base"],
         "//conditions:default": [],
     }),
 )
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 5fb4f5eeb8..6c25dfd00b 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -45,8 +45,6 @@ filegroup(
         # TODO(bazel-team): Once https://github.com/bazelbuild/bazel/issues/2241
         # is resolved, use cc implementation of singlejar on windows
         "//src/conditions:windows": ["//src/java_tools/singlejar:SingleJar_deploy.jar"],
-        "//src/conditions:windows_msys": ["//src/java_tools/singlejar:SingleJar_deploy.jar"],
-        "//src/conditions:windows_msvc": ["//src/java_tools/singlejar:SingleJar_deploy.jar"],
         "//conditions:default": ["//src/tools/singlejar:singlejar"],
     }),
     visibility = [
@@ -175,8 +173,6 @@ sh_test(
         "//src/conditions:darwin": [],
         "//src/conditions:darwin_x86_64": [],
         "//src/conditions:windows": [],
-        "//src/conditions:windows_msys": [],
-        "//src/conditions:windows_msvc": [],
         "//conditions:default": ["//src/test/shell/bazel/testdata:bazel_toolchain_test_project_pkg"],
     }),
     tags = [
diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD
index 92cef9294d..37a19332ce 100644
--- a/src/test/shell/integration/BUILD
+++ b/src/test/shell/integration/BUILD
@@ -341,7 +341,6 @@ cc_binary(
     testonly = 1,
     srcs = select({
         "//src/conditions:windows": ["spend_cpu_time_windows.cc"],
-        "//src/conditions:windows_msvc": ["spend_cpu_time_windows.cc"],
         "//conditions:default": ["spend_cpu_time.cc"],
     }),
     visibility = [
diff --git a/src/tools/android/java/com/google/devtools/build/android/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/BUILD.tools
index 784b778d54..fc9cd8b5ca 100644
--- a/src/tools/android/java/com/google/devtools/build/android/BUILD.tools
+++ b/src/tools/android/java/com/google/devtools/build/android/BUILD.tools
@@ -9,7 +9,6 @@ java_binary(
     name = "ResourceProcessorBusyBox",
     data = select({
         "//src/conditions:windows": ["//src/main/native/windows:windows_jni.dll"],
-        "//src/conditions:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
         "//conditions:default": [],
     }),
     main_class = "com.google.devtools.build.android.ResourceProcessorBusyBox",
diff --git a/src/tools/android/java/com/google/devtools/build/android/junctions/BUILD b/src/tools/android/java/com/google/devtools/build/android/junctions/BUILD
index de671c20b1..6ebc748d97 100644
--- a/src/tools/android/java/com/google/devtools/build/android/junctions/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/junctions/BUILD
@@ -31,8 +31,6 @@ java_library(
     srcs = glob(["*.java"]),
     data = select({
         "//src/conditions:windows": ["//src/main/native/windows:windows_jni.dll"],
-        "//src/conditions:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
-        "//src/conditions:windows_msys": ["//src/main/native/windows:windows_jni.dll"],
         "//conditions:default": [],
     }),
     visibility = [
diff --git a/src/tools/runfiles/BUILD b/src/tools/runfiles/BUILD
index 6504fb8bc0..3627e4330d 100644
--- a/src/tools/runfiles/BUILD
+++ b/src/tools/runfiles/BUILD
@@ -26,8 +26,6 @@ sh_test(
     name = "runfiles_sh_test",
     srcs = select({
         "//src/conditions:windows": ["runfiles_windows_test.sh"],
-        "//src/conditions:windows_msys": ["runfiles_windows_test.sh"],
-        "//src/conditions:windows_msvc": ["runfiles_windows_test.sh"],
         "//conditions:default": ["runfiles_posix_test.sh"],
     }),
     deps = [":runfiles_sh_lib"],
diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD
index e7ff2ae6c4..3545e1f6e1 100644
--- a/src/tools/singlejar/BUILD
+++ b/src/tools/singlejar/BUILD
@@ -6,8 +6,6 @@ JAR_TOOL_PATH_COPT_TPL = "-DJAR_TOOL_PATH=\\\"external/local_jdk/bin/jar%s\\\""
 
 JAR_TOOL_PATH_COPTS = select({
     "//src/conditions:windows": [JAR_TOOL_PATH_COPT_TPL % ".exe"],
-    "//src/conditions:windows_msvc": [JAR_TOOL_PATH_COPT_TPL % ".exe"],
-    "//src/conditions:windows_msys": [JAR_TOOL_PATH_COPT_TPL % ".exe"],
     "//conditions:default": [JAR_TOOL_PATH_COPT_TPL % ""],
 })