Windows: fix ijar compilation from ext.repo

[laszlocsomor]

//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 #8614

[iirina]

Could you please add the following two test cases to src/test/shell/bazel/bazel_java_tools_test.sh

function test_java_tools_singlejar_builds() {  
  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
        java_tools_zip_file_url="file:///${java_tools_rlocation}"
  fi
  cat >WORKSPACE <<EOF
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
    name = "local_java_tools",
    urls = ["${java_tools_zip_file_url}"]
)
EOF
  bazel build @local_java_tools//:singlejar_cc_bin || fail "singlejar failed to build"
}

 function test_java_tools_ijar_builds() {
  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
        java_tools_zip_file_url="file:///${java_tools_rlocation}"
  fi
  cat >WORKSPACE <<EOF
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "local_java_tools",
    urls = ["${java_tools_zip_file_url}"]
)
EOF
  bazel build @local_java_tools//:ijar_cc_binary || fail "ijar failed to build"
}

They should test it fixes #8614.

[laszlocsomor]

Done.

[iirina]

Thank you so much for fixing this!!

[laszlocsomor]

The test fails because token_stream in tools/jdk/BUILD.java_tools does not depend on .../util/path_platform.h. If I add java_tools/src/main/cpp/util/path_platform.h to the rule's hdrs, I get a header check error because the same file is present under external/bazel_tools but that's not a declared rule input:

ERROR: C:/_bazel/okv4kk6b/external/local_java_tools/BUILD:552:1: undeclared inclusion(s) in rule '@local_java_tools//:singlejar_cc_bin':
this rule is missing dependency declarations for the following files included by 'external/local_java_tools/java_tools/src/tools/singlejar/singlejar_main.cc':
  'external/bazel_tools/src/main/cpp/util/path_platform.h'
Target @local_java_tools//:singlejar_cc_bin failed to build

Unfortunately on Windows we must expect this error because every action runs in the one and only execroot and they all share it, so all inputs are visible to every action. (There's no sandboxing yet.)

[laszlocsomor]

My latest change didn't fix the test on Windows.

The problem is that @local_java_tools//:ijar_cc_binary depends on @local_java_tools//ijar/zip.h (with "include_prefix" and "strip_include_prefix" the include path being "third_party/ijar/zip.h"), but the rule also depends on some other rules in @bazel_tools. Because of the dependencies, both external/bazel_tools and external/local_java_tools are include directories. Unfortunately external/bazel_tools/third_party/ijar/zip.h also exists, and the compiler picks that file before encountering external/local_java_tools/java_tools/ijar/zip.h, so header checking fails.

At this point I'm giving up and abandoning this PR, because I don't know how to fix this without sandboxing.

[meteorcloudy]

@iirina After #8950, building ijar and singlejar fail on Windows due to header check mentioned here by @laszlocsomor .

but the rule also depends on some other rules in @bazel_tools

This is actually not true, the rule is not depending on anything under @bazel_tools, but /Iexternal/bazel_tools still got added. @oquenchil Do you know why we add /Iexternal/bazel_tools for every compile action unconditionally?