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

2 files changed, 0 insertions, 26 deletions

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"],
-)