aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com
diff options
context:
space:
mode:
authorGravatar Laszlo Csomor <laszlocsomor@google.com>2017-07-10 13:30:04 +0200
committerGravatar László Csomor <laszlocsomor@google.com>2017-07-10 14:37:35 +0200
commit8a9be26492651afd8c71e5da98751e36d948b4e5 (patch)
tree7ad723c34dbba601d987a5201df49fd6483648d2 /src/main/java/com
parent3fbd7c43fe329c7052b7105d6941205680fb1a3d (diff)
Windows, Android BusyBox: create JunctionCreator
Introduce the JunctionCreator classes that the Android BusyBox can use to work around path length limitations on Windows. See https://github.com/bazelbuild/bazel/issues/3264 Change-Id: Ia5ee39f0635dcc2690ffb1755dc56d21e7bc7536 PiperOrigin-RevId: 161378422
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/google/devtools/build/lib/windows/jni/BUILD31
-rw-r--r--src/main/java/com/google/devtools/build/lib/windows/jni/WindowsJniLoader.java2
2 files changed, 28 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/windows/jni/BUILD b/src/main/java/com/google/devtools/build/lib/windows/jni/BUILD
index ed8ca69799..d295eacb0a 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/jni/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/windows/jni/BUILD
@@ -1,17 +1,38 @@
-package(
- default_visibility = [
- "//src/main/java/com/google/devtools/build/lib:__subpackages__",
- "//src/test/java/com/google/devtools/build/lib:__subpackages__",
+package(default_visibility = ["//visibility:private"])
+
+package_group(
+ name = "android-junctions-prod",
+ packages = [
+ "//src/tools/android/java/com/google/devtools/build/android/junctions",
+ ],
+)
+
+package_group(
+ name = "bazel-prod",
+ packages = [
+ "//src/main/java/com/google/devtools/build/lib/...",
+ ],
+)
+
+package_group(
+ name = "bazel-tests",
+ packages = [
+ "//src/test/java/com/google/devtools/build/lib/...",
],
)
filegroup(
name = "srcs",
srcs = glob(["**"]),
+ visibility = [":bazel-prod"],
)
java_library(
name = "jni",
+ visibility = [
+ ":bazel-prod",
+ ":bazel-tests",
+ ],
exports = [
":file",
":processes",
@@ -21,12 +42,14 @@ java_library(
java_library(
name = "file",
srcs = ["WindowsFileOperations.java"],
+ visibility = [":android-junctions-prod"],
deps = [":jni-loader"],
)
java_library(
name = "processes",
srcs = ["WindowsProcesses.java"],
+ visibility = [":bazel-prod"],
deps = [":jni-loader"],
)
diff --git a/src/main/java/com/google/devtools/build/lib/windows/jni/WindowsJniLoader.java b/src/main/java/com/google/devtools/build/lib/windows/jni/WindowsJniLoader.java
index b68c1a8b07..974fe4e6dc 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/jni/WindowsJniLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/windows/jni/WindowsJniLoader.java
@@ -29,7 +29,7 @@ public class WindowsJniLoader {
try {
System.loadLibrary("windows_jni");
} catch (UnsatisfiedLinkError ex) {
- // We are probably in tests, let's try to find the library in the runfiles
+ // Try to find the library in the runfiles.
try {
System.load(WindowsRunfiles.getRunfile("io_bazel/src/main/native/windows/windows_jni.dll"));
} catch (IOException e) {