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

3 files changed, 9 insertions, 30 deletions

diff --git a/tools/android/BUILD b/tools/android/BUILD
index ae8328f577..b036998da3 100644
--- a/tools/android/BUILD
+++ b/tools/android/BUILD
@@ -184,12 +184,10 @@ py_test(
     name = "junction_test",
     srcs = select({
         "//src/conditions:windows": ["junction_test.py"],
-        "//src/conditions:windows_msvc": ["junction_test.py"],
         "//conditions:default": ["dummy_test.py"],
     }),
     main = select({
         "//src/conditions:windows": "junction_test.py",
-        "//src/conditions:windows_msvc": "junction_test.py",
         "//conditions:default": "dummy_test.py",
     }),
     deps = [
diff --git a/tools/android/BUILD.tools b/tools/android/BUILD.tools
index 4ca0f31758..a59510fff3 100644
--- a/tools/android/BUILD.tools
+++ b/tools/android/BUILD.tools
@@ -67,7 +67,6 @@ java_import(
     name = "singlejar_deploy",
     jars = select({
         "//src/conditions:windows": ["@bazel_tools//tools/jdk:singlejar"],
-        "//src/conditions:windows_msvc": ["@bazel_tools//tools/jdk:singlejar"],
         "//conditions:default": [],
     }),
     visibility = ["//visibility:private"],
@@ -78,7 +77,6 @@ java_binary(
     main_class = "com.google.devtools.build.singlejar.SingleJar",
     runtime_deps = select({
         "//src/conditions:windows": [":singlejar_deploy"],
-        "//src/conditions:windows_msvc": [":singlejar_deploy"],
         "//conditions:default": [],
     }),
     visibility = ["//visibility:private"],
@@ -108,13 +106,11 @@ genrule(
     ],
     tools = select({
         "//src/conditions:windows": [":singlejar_javabin"],
-        "//src/conditions:windows_msvc": [":singlejar_javabin"],
         "//conditions:default": ["@bazel_tools//tools/jdk:singlejar"],
     }),
     outs = ["java_lang_extras.jar"],
     cmd = select({
         "//src/conditions:windows": gen_java_lang_extras_jar_cmd % ":singlejar_javabin",
-        "//src/conditions:windows_msvc": gen_java_lang_extras_jar_cmd % ":singlejar_javabin",
         "//conditions:default": gen_java_lang_extras_jar_cmd % "@bazel_tools//tools/jdk:singlejar",
     }),
     visibility = ["//visibility:private"],
diff --git a/tools/android/android_sdk_repository_template.bzl b/tools/android/android_sdk_repository_template.bzl
index e657eaafc9..637bbf2978 100644
--- a/tools/android/android_sdk_repository_template.bzl
+++ b/tools/android/android_sdk_repository_template.bzl
@@ -13,18 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-def create_config_setting_rules():
-  """Create config_setting rules for windows_msvc, windows_msys, windows.
+def create_config_setting_rule():
+  """Create config_setting rule for windows.
 
   These represent the matching --host_cpu values.
   """
-  for suffix in ["", "_msvc", "_msys"]:
-    name = "windows" + suffix
-    if not native.existing_rule(name):
-      native.config_setting(
-          name = name,
-          values = {"host_cpu": "x64_" + name},
-      )
+  name = "windows"
+  if not native.existing_rule(name):
+    native.config_setting(
+        name = name,
+        values = {"host_cpu": "x64_" + name},
+    )
 
 def create_android_sdk_rules(
     name,
@@ -45,7 +44,7 @@ def create_android_sdk_rules(
         --android_sdk is not specified on the command line.
   """
 
-  create_config_setting_rules()
+  create_config_setting_rule()
 
   windows_only_files = [
       "build-tools/%s/aapt.exe" % build_tools_directory,
@@ -81,8 +80,6 @@ def create_android_sdk_rules(
           for filename in ["android.jar", "framework.aidl"]
       ] + select({
           ":windows": windows_only_files,
-          ":windows_msvc": windows_only_files,
-          ":windows_msys": windows_only_files,
           "//conditions:default": linux_only_files,
       }),
   )
@@ -102,29 +99,21 @@ def create_android_sdk_rules(
         proguard = "@bazel_tools//third_party/java/proguard",
         aapt = select({
             ":windows": "build-tools/%s/aapt.exe" % build_tools_directory,
-            ":windows_msvc": "build-tools/%s/aapt.exe" % build_tools_directory,
-            ":windows_msys": "build-tools/%s/aapt.exe" % build_tools_directory,
             "//conditions:default": ":aapt_binary",
         }),
         aapt2 = select({
             ":windows": "build-tools/%s/aapt2.exe" % build_tools_directory,
-            ":windows_msvc": "build-tools/%s/aapt2.exe" % build_tools_directory,
-            ":windows_msys": "build-tools/%s/aapt2.exe" % build_tools_directory,
             "//conditions:default": ":aapt2_binary",
         }),
         dx = ":dx_binary",
         main_dex_list_creator = ":main_dex_list_creator",
         adb = select({
             ":windows": "platform-tools/adb.exe",
-            ":windows_msvc": "platform-tools/adb.exe",
-            ":windows_msys": "platform-tools/adb.exe",
             "//conditions:default": "platform-tools/adb",
         }),
         framework_aidl = "platforms/android-%d/framework.aidl" % api_level,
         aidl = select({
             ":windows": "build-tools/%s/aidl.exe" % build_tools_directory,
-            ":windows_msvc": "build-tools/%s/aidl.exe" % build_tools_directory,
-            ":windows_msys": "build-tools/%s/aidl.exe" % build_tools_directory,
             "//conditions:default": ":aidl_binary",
         }),
         android_jar = "platforms/android-%d/android.jar" % api_level,
@@ -134,8 +123,6 @@ def create_android_sdk_rules(
         apksigner = ":apksigner",
         zipalign = select({
             ":windows": "build-tools/%s/zipalign.exe" % build_tools_directory,
-            ":windows_msvc": "build-tools/%s/zipalign.exe" % build_tools_directory,
-            ":windows_msys": "build-tools/%s/zipalign.exe" % build_tools_directory,
             "//conditions:default": ":zipalign_binary",
         }),
     )
@@ -198,8 +185,6 @@ def create_android_sdk_rules(
       name = "fail",
       srcs = select({
           ":windows": [":generate_fail_cmd"],
-          ":windows_msvc": [":generate_fail_cmd"],
-          ":windows_msys": [":generate_fail_cmd"],
           "//conditions:default": [":generate_fail_sh"],
       }),
   )