aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar laszlocsomor <laszlocsomor@google.com>2017-08-01 17:37:47 +0200
committerGravatar Dmitry Lomov <dslomov@google.com>2017-08-01 17:45:22 +0200
commit6563b2d42d29196432d5fcafa0144b8371fbb028 (patch)
tree86758cf5cc5a5222eb9454add721f0a9135940c9
parent8ba16a6afc0a08f9c47419284f96422728189e07 (diff)
Bazel, Android: fix Bazel CI breakage
Add a `select` so Bazel won't try to build windows_jni.dll on Linux/MacOS. RELNOTES: none PiperOrigin-RevId: 163832982
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/BUILD.tools6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/BUILD.tools
index e67a400f97..d94dc4b04e 100644
--- a/src/tools/android/java/com/google/devtools/build/android/BUILD.tools
+++ b/src/tools/android/java/com/google/devtools/build/android/BUILD.tools
@@ -11,5 +11,9 @@ java_binary(
runtime_deps = [
":classes",
],
- data = ["//src/main/native/windows:windows_jni.dll"],
+ data = select({
+ "//src:windows": ["//src/main/native/windows:windows_jni.dll"],
+ "//src:windows_msvc": ["//src/main/native/windows:windows_jni.dll"],
+ "//conditions:default": [],
+ }),
)