From b1d9d252c2b6be5e4efa94b157316ca55404c7a7 Mon Sep 17 00:00:00 2001
From: Yun Peng <pcloudy@google.com>
Date: Tue, 23 Jul 2019 12:46:12 +0200
Subject: [PATCH] Fix ijar_cc_binary and singlejar_cc_bin by removing
 dependency on @bazel_tools//tools/cpp:malloc

---
 src/test/shell/bazel/bazel_java_tools_test.sh |  6 ------
 tools/jdk/BUILD.java_tools                    | 10 ++++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/test/shell/bazel/bazel_java_tools_test.sh b/src/test/shell/bazel/bazel_java_tools_test.sh
index 9a0f008bc27767..e57a1594ef27e1 100755
--- a/src/test/shell/bazel/bazel_java_tools_test.sh
+++ b/src/test/shell/bazel/bazel_java_tools_test.sh
@@ -190,9 +190,6 @@ EOF
 }
 
 function test_java_tools_singlejar_builds() {
-  if "$is_windows"; then
-    echo "Skipping test on Windows." && return
-  fi
   local java_tools_rlocation=$(rlocation io_bazel/src/java_tools_${JAVA_TOOLS_JAVA_VERSION}.zip)
   local java_tools_zip_file_url="file://${java_tools_rlocation}"
   if "$is_windows"; then
@@ -209,9 +206,6 @@ EOF
 }
 
 function test_java_tools_ijar_builds() {
-  if "$is_windows"; then
-    echo "Skipping test on Windows." && return
-  fi
   local java_tools_rlocation=$(rlocation io_bazel/src/java_tools_${JAVA_TOOLS_JAVA_VERSION}.zip)
   local java_tools_zip_file_url="file://${java_tools_rlocation}"
   if "$is_windows"; then
diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools
index 67d10a08941857..4d49f37025a05c 100644
--- a/tools/jdk/BUILD.java_tools
+++ b/tools/jdk/BUILD.java_tools
@@ -341,12 +341,19 @@ filegroup(
     }),
 )
 
+cc_library(
+    name = "malloc",
+)
+
 cc_binary(
     name = "ijar_cc_binary",
     srcs = [
         "java_tools/ijar/classfile.cc",
         "java_tools/ijar/ijar.cc",
     ],
+    # Remove dependency on @bazel_tools//tools/cpp:malloc, which avoid /Iexternal/tools being used
+    # in compiling actions.
+    malloc = ":malloc",
     deps = [":zip"],
 )
 
@@ -569,6 +576,9 @@ cc_binary(
         "//conditions:default": [],
     }),
     linkstatic = 1,
+    # Remove dependency on @bazel_tools//tools/cpp:malloc, which avoid /Iexternal/tools being used
+    # in compiling actions.
+    malloc = ":malloc",
     visibility = ["//visibility:public"],
     deps = [
         ":options",