Skip to content

Commit

Permalink
Windows: fix ijar compilation from ext.repo
Browse files Browse the repository at this point in the history
//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 bazelbuild#8614
  • Loading branch information
laszlocsomor committed Jun 28, 2019
1 parent 8d76cb6 commit 5e52257
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions tools/jdk/BUILD.java_tools
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down

0 comments on commit 5e52257

Please sign in to comment.