diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-02-17 15:27:32 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-02-17 15:36:59 +0000 |
| commit | 1bab6b10e72f9c2877af51cc6193c3dad3be6d33 (patch) | |
| tree | 5851fc7c2da6ba7746e99b3daaf508e6eaadd9d5 /src | |
| parent | 829b561d10c5226284d16fb247deac0c4485bb4e (diff) | |
Stop bundling ijar's sources in bazel_tools
Instead bundle ijar's zipper binary so the skylark rules that depends on it
can use it from @bazel_tools.
A commit introducing windows config settings broke our appengine tutorial.
--
MOS_MIGRATED_REVID=114857080
Diffstat (limited to 'src')
| -rw-r--r-- | src/BUILD | 13 | ||||
| -rwxr-xr-x | src/create_embedded_tools.sh | 2 |
2 files changed, 12 insertions, 3 deletions
@@ -107,9 +107,16 @@ genrule( "//third_party/ijar", "//third_party/java/apkbuilder:embedded_tools", ] + select({ - ":darwin": [":darwin_tools"], - ":darwin_x86_64": [":darwin_tools"], - "//conditions:default": [], + ":darwin": [ + ":darwin_tools", + "//third_party/ijar:zipper", + ], + ":darwin_x86_64": [ + ":darwin_tools", + "//third_party/ijar:zipper", + ], + ":windows": [], # Windows specifically exclude zipper for now. + "//conditions:default": ["//third_party/ijar:zipper"], }), outs = ["embedded_tools.zip"], cmd = "$(location :create_embedded_tools.sh) $@ $(SRCS)", diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh index 8b4c07eacc..e3b751c3b0 100755 --- a/src/create_embedded_tools.sh +++ b/src/create_embedded_tools.sh @@ -34,6 +34,8 @@ for i in $*; do *Runner_deploy.jar) OUTPUT_PATH=tools/jdk/TestRunner_deploy.jar ;; *ijar.exe) OUTPUT_PATH=tools/jdk/ijar/ijar.exe ;; *ijar) OUTPUT_PATH=tools/jdk/ijar/ijar ;; + *zipper.exe) OUTPUT_PATH=tools/zip/zipper/zipper.exe ;; + *zipper) OUTPUT_PATH=tools/zip/zipper/zipper ;; *src/objc_tools/*) OUTPUT_PATH=tools/objc/precomp_${i##*/} ;; *xcode*StdRedirect.dylib) OUTPUT_PATH=tools/objc/StdRedirect.dylib ;; *xcode*realpath) OUTPUT_PATH=tools/objc/realpath ;; |