diff options
| author |  xingao <xingao@google.com> | 2017-06-01 19:23:29 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-06-02 15:23:24 +0200 |
| commit | 202d5910a194ae5a0dfbc11692a17e8013017aca (patch) | |
| tree | 080ce0bc4cef9d85e35d994fd25c3a4cd49c825b /src/test/shell | |
| parent | 1a16736002e466de7975e5461a8898e270b5a3b1 (diff) | |
Automated g4 rollback of commit dba22f337a20d3e8f3ac8dfd23bc6fa69e4528da.
*** Reason for rollback ***
Use Java implementation of singlejar on FreeBSD, and roll forward change 157473007.
*** Original change description ***
Automated g4 rollback of commit d894345ed88f8adce600b66a310b5210d0bcb59c.
*** Reason for rollback ***
Breaks Bazel on FreeBSD: http://ci.bazel.io/view/Dashboard/job/Bazel/JAVA_VERSION=1.8,PLATFORM_NAME=freebsd-11/1542/console
*** Original change description ***
Use cc implementation of singlejar except on Windows.
Change-Id: Ie4a2db2a6fa1ea86f4bdd42cd806f6804a0c56d4
PiperOrigin-RevId: 157729503
Diffstat (limited to 'src/test/shell')
| -rw-r--r-- | src/test/shell/bazel/BUILD | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index b0ac3fdff2..088c5a364f 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -30,7 +30,6 @@ filegroup( "//src:bazel", "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar", "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar", - "//src/java_tools/singlejar:SingleJar_deploy.jar", "//src/main/tools:linux-sandbox", "//src/main/tools:process-wrapper", "//src/test/shell:bashunit", @@ -45,7 +44,17 @@ filegroup( # TODO(cushon): migrate to extclasspath and delete "@local_jdk//:extdir", "@local_jdk//:jdk", - ], + ] + select({ + # TODO(bazel-team): Once https://github.com/bazelbuild/bazel/issues/3096 + # is resolved, use cc implementation of singlejar on freebsd + "//src:freebsd": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], + # TODO(bazel-team): Once https://github.com/bazelbuild/bazel/issues/2241 + # is resolved, use cc implementation of singlejar on windows + "//src:windows": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], + "//src:windows_msys": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], + "//src:windows_msvc": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], + "//conditions:default": ["//src/tools/singlejar:singlejar"], + }), visibility = [ "//src/test/shell:__subpackages__", ], |