Load JNI library on Windows from the runfiles tree as a fallback

This is the behavior of the UnixJniLoader. In order to do that, this
change also moved the runfiles support on Windows in its own library
that the WindowsJniLoader can use to load the JNI library from tests.

Also add the JNI library on Windows to all test that use the JNI library
on Unix.

Fixes #2300.

--
Change-Id: I2eb9207c3aa310d95912a48f64f676957c47cd34
Reviewed-on: https://cr.bazel.build/8045
PiperOrigin-RevId: 143114397
MOS_MIGRATED_REVID=143114397

4 files changed, 94 insertions, 51 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/windows/WindowsJniLoader.java b/src/main/java/com/google/devtools/build/lib/windows/WindowsJniLoader.java
index 2fe564e678..6f42c1cf7f 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/WindowsJniLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/windows/WindowsJniLoader.java
@@ -14,6 +14,8 @@
 
 package com.google.devtools.build.lib.windows;
 
+import java.io.IOException;
+
 /**
  * Loads native code under Windows.
  */
@@ -24,7 +26,17 @@ public class WindowsJniLoader {
       return;
     }
 
-    System.loadLibrary("windows_jni");
+    try {
+      System.loadLibrary("windows_jni");
+    } catch (UnsatisfiedLinkError ex) {
+      // We are probably in tests, let's try to find the library in the runfiles
+      try {
+        System.load(WindowsRunfiles.getRunfile("io_bazel/src/main/native/windows_jni.dll"));
+      } catch (IOException e) {
+        // We throw the UnsatisfiedLinkError if we cannot find the runfiles
+        throw ex;
+      }
+    }
     jniLoaded = true;
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/windows/WindowsRunfiles.java b/src/main/java/com/google/devtools/build/lib/windows/WindowsRunfiles.java
new file mode 100644
index 0000000000..876531073a
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/windows/WindowsRunfiles.java
@@ -0,0 +1,66 @@
+// Copyright 2016 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.devtools.build.lib.windows;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+
+/** Utility class for getting runfiles in tests on Windows. */
+public final class WindowsRunfiles {
+
+  private static Map<String, String> runfiles;
+
+  /**
+   * Returns the actual path on the system corresponding to a given runfiles path. On Unix-like with
+   * the symlink tree, this function could just returns the runfiles path and let the symlinks do
+   * the actual resolution.
+   */
+  public static String getRunfile(String runfilesPath) throws IOException {
+    ensureRunfilesParsed();
+    return runfiles.get(runfilesPath);
+  }
+
+  private static synchronized void ensureRunfilesParsed() throws IOException {
+    if (runfiles != null) {
+      return;
+    }
+
+    runfiles = new HashMap<>();
+    InputStream fis = new FileInputStream(System.getenv("RUNFILES_MANIFEST_FILE"));
+    InputStreamReader isr = new InputStreamReader(fis, Charset.forName("UTF-8"));
+    try (BufferedReader br = new BufferedReader(isr)) {
+      String line;
+      while ((line = br.readLine()) != null) {
+        line = line.trim();
+        if (!line.isEmpty()) {
+          // TODO(bazel-team): This is buggy when the path contains spaces, we should fix the
+          // manifest format.
+          String[] splitLine = line.split(" ");
+          if (splitLine.length != 2) {
+            throw new IllegalStateException("Runfiles manifest entry contains more than one space");
+          }
+
+          runfiles.put(splitLine[0], splitLine[1]);
+        }   
+      }
+    }
+  }
+}
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 75e43c16ad..3f4392edce 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -20,6 +20,15 @@ WINDOWS_ON_WINDOWS_TESTS = glob(
 # All Windows-specific tests. Use this to exclude Windows tests from globs.
 ALL_WINDOWS_TESTS = CROSS_PLATFORM_WINDOWS_TESTS + WINDOWS_ON_WINDOWS_TESTS
 
+JNI_LIB = select({
+    "//src:windows": ["//src/main/native:windows_jni.dll"],
+    "//src:windows_msvc": ["//src/main/native:windows_jni.dll"],
+    "//conditions:default": [
+        "//src/main/native:libunix.dylib",
+        "//src/main/native:libunix.so",
+    ],
+})
+
 filegroup(
     name = "srcs",
     srcs = glob(["**"]) + [
@@ -78,14 +87,7 @@ java_library(
         "vfs/util/*.java",
         "events/util/*.java",
     ]),
-    data = select({
-        "//src:windows": [],
-        "//src:windows_msvc": [],
-        "//conditions:default": [
-            "//src/main/native:libunix.dylib",
-            "//src/main/native:libunix.so",
-        ],
-    }),
+    data = JNI_LIB,
     deps = [
         ":testutil",
         "//src/main/java/com/google/devtools/build/lib:bazel-main",
@@ -217,14 +219,7 @@ java_test(
     srcs = WINDOWS_ON_WINDOWS_TESTS,
     data = [
         ":MockSubprocess_deploy.jar",
-    ] + select({
-        "//src:windows": ["//src/main/native:windows_jni.dll"],
-        "//src:windows_msvc": ["//src/main/native:windows_jni.dll"],
-        "//conditions:default": [
-            "//src/main/native:libunix.dylib",
-            "//src/main/native:libunix.so",
-        ],
-    }),
+    ] + JNI_LIB,
     test_class = "com.google.devtools.build.lib.AllTests",
     deps = [
         ":test_runner",
diff --git a/src/test/java/com/google/devtools/build/lib/windows/util/WindowsTestUtil.java b/src/test/java/com/google/devtools/build/lib/windows/util/WindowsTestUtil.java
index c68d5199fa..77268751fe 100644
--- a/src/test/java/com/google/devtools/build/lib/windows/util/WindowsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/windows/util/WindowsTestUtil.java
@@ -22,17 +22,12 @@ import com.google.common.base.Strings;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.windows.WindowsJniLoader;
-import java.io.BufferedReader;
+import com.google.devtools.build.lib.windows.WindowsRunfiles;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -40,8 +35,6 @@ import java.util.concurrent.TimeUnit;
 /** Utilities for running Java tests on Windows. */
 public final class WindowsTestUtil {
 
-  private static Map<String, String> runfiles;
-
   /** A path where temp files can be created. It is NOT owned by this class. */
   private final String scratchRoot;
 
@@ -50,9 +43,8 @@ public final class WindowsTestUtil {
   }
 
   /** Ensure the actual JNI DLL is loaded. */
-  public static void loadJni() throws Exception {
-    String jniDllPath = WindowsTestUtil.getRunfile("io_bazel/src/main/native/windows_jni.dll");
-    WindowsJniLoader.loadJniForTesting(jniDllPath);
+  public static void loadJni() {
+    WindowsJniLoader.loadJni();
   }
 
   /**
@@ -145,29 +137,7 @@ public final class WindowsTestUtil {
   }
 
   public static String getRunfile(String runfilesPath) throws IOException {
-    ensureRunfilesParsed();
-    return runfiles.get(runfilesPath);
-  }
-
-  private static synchronized void ensureRunfilesParsed() throws IOException {
-    if (runfiles != null) {
-      return;
-    }
-
-    runfiles = new HashMap<>();
-    InputStream fis = new FileInputStream(System.getenv("RUNFILES_MANIFEST_FILE"));
-    InputStreamReader isr = new InputStreamReader(fis, Charset.forName("UTF-8"));
-    try (BufferedReader br = new BufferedReader(isr)) {
-      String line;
-      while ((line = br.readLine()) != null) {
-        String[] splitLine = line.split(" "); // This is buggy when the path contains spaces
-        if (splitLine.length != 2) {
-          continue;
-        }
-
-        runfiles.put(splitLine[0], splitLine[1]);
-      }
-    }
+    return WindowsRunfiles.getRunfile(runfilesPath);
   }
 
   public Path createVfsPath(FileSystem fs, String path) throws IOException {