From fac32a59ad1e8b7a676cb636da359e08a1e3d3ed Mon Sep 17 00:00:00 2001
From: Yun Peng <pcloudy@google.com>
Date: Wed, 10 Nov 2021 16:38:39 +0100
Subject: [PATCH] Don't build //toolchains/... on CI

---
 .bazelci/presubmit.yml |  3 +++
 toolchains/BUILD       | 55 ++++++++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index fde63a76..745a59c9 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -6,9 +6,12 @@ tasks:
   ubuntu2004:
     build_targets:
     - "//..."
+    - "-//toolchains/..."
   macos:
     build_targets:
     - "//..."
+    - "-//toolchains/..."
   windows:
     build_targets:
     - "//..."
+    - "-//toolchains/..."
diff --git a/toolchains/BUILD b/toolchains/BUILD
index e5f76a8e..8b841c78 100644
--- a/toolchains/BUILD
+++ b/toolchains/BUILD
@@ -46,9 +46,10 @@ java_host_runtime_alias(name = "current_host_java_runtime")
 java_toolchain_alias(name = "current_java_toolchain")
 
 # Aliases value of --plugins flag as a JavaPluginInfo
-java_plugins_flag_alias(
-    name = "java_plugins_flag_alias",
-)
+# TODO: java_plugins_flag_alias cannot be used in rules_java
+# java_plugins_flag_alias(
+#     name = "java_plugins_flag_alias",
+# )
 
 # This is necessary to get the *host* Java runtime. Depending on
 # //tools/jdk:current_java_runtime from an attribute with the host transition
@@ -413,24 +414,25 @@ filegroup(
     visibility = ["//tools:__pkg__"],
 )
 
-py_binary(
-    name = "proguard_whitelister",
-    srcs = [
-        "proguard_whitelister.py",
-    ],
-    deps = [
-        "//third_party/py/abseil",
-    ],
-)
-
-py_test(
-    name = "proguard_whitelister_test",
-    srcs = ["proguard_whitelister_test.py"],
-    data = ["proguard_whitelister_test_input.pgcfg"],
-    deps = [
-        ":proguard_whitelister",
-    ],
-)
+# TODO: should those targets stay in rules_java?
+# py_binary(
+#     name = "proguard_whitelister",
+#     srcs = [
+#         "proguard_whitelister.py",
+#     ],
+#     deps = [
+#         "//third_party/py/abseil",
+#     ],
+# )
+# 
+# py_test(
+#     name = "proguard_whitelister_test",
+#     srcs = ["proguard_whitelister_test.py"],
+#     data = ["proguard_whitelister_test_input.pgcfg"],
+#     deps = [
+#         ":proguard_whitelister",
+#     ],
+# )
 
 # Aliases for JDKs, so that they are only downloaded when needed.
 _JDKS = [
@@ -489,8 +491,9 @@ java_runtime_version_alias(
     visibility = ["//visibility:public"],
 )
 
-java_runtime_version_alias(
-    name = "jdk_8",
-    runtime_version = "8",
-    visibility = ["//visibility:public"],
-)
+# TODO: drop JDK 8 support?
+# java_runtime_version_alias(
+#     name = "jdk_8",
+#     runtime_version = "8",
+#     visibility = ["//visibility:public"],
+# )