From 5e52257fd112385f140671d3132f9bef0ab9ba4e Mon Sep 17 00:00:00 2001 From: Laszlo Csomor Date: Fri, 28 Jun 2019 11:30:58 +0200 Subject: [PATCH] Windows: fix ijar compilation from ext.repo //src/main/native/windows:lib-file and //src/main/native/windows:lib-util were merged into one rule some time ago. This commit merges the copies of those libraries in tools/jdk/BUILD accordingly. Fixes https://github.com/bazelbuild/bazel/issues/8614 --- tools/jdk/BUILD.java_tools | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools index 298f8607196306..ecc8ef92b7e668 100644 --- a/tools/jdk/BUILD.java_tools +++ b/tools/jdk/BUILD.java_tools @@ -473,16 +473,14 @@ cc_library( cc_library( name = "lib-file", - srcs = ["java_tools/src/main/native/windows/file.cc"], - hdrs = ["java_tools/src/main/native/windows/file.h"], - strip_include_prefix = "java_tools", - deps = [":lib-util"], -) - -cc_library( - name = "lib-util", - srcs = ["java_tools/src/main/native/windows/util.cc"], - hdrs = ["java_tools/src/main/native/windows/util.h"], + srcs = [ + "java_tools/src/main/native/windows/file.cc", + "java_tools/src/main/native/windows/util.cc", + ], + hdrs = [ + "java_tools/src/main/native/windows/file.h", + "java_tools/src/main/native/windows/util.h", + ], strip_include_prefix = "java_tools", )