diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-04-12 13:59:41 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2016-04-13 08:08:43 +0000 |
| commit | 6cb8d820689ad029a9d0dc4ee1100db9b2d96515 (patch) | |
| tree | 8cd2592242f96ef77a676ffc23a4d87bb7922336 /compile.sh | |
| parent | 75250e614fbfc9d1597ca8d7c7324880690c1e27 (diff) | |
Refactor build for JDK 7
Now the JDK 7 tuning happens all in Bazel, removing logic
from the CI script. It uses remote repositories to access
JDK 7 dependencies.
--
Change-Id: Iff590c6642ca5b2343aa15096f8fd837d1c80787
Reviewed-on: https://bazel-review.googlesource.com/#/c/3327
MOS_MIGRATED_REVID=119634530
Diffstat (limited to 'compile.sh')
| -rwxr-xr-x | compile.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compile.sh b/compile.sh index 56299b8f1b..da75ec02d3 100755 --- a/compile.sh +++ b/compile.sh @@ -96,8 +96,8 @@ if [ $DO_COMPILE ]; then new_step 'Building Bazel with Bazel' display "." log "Building output/bazel" - bazel_build "src:bazel${EXE_EXT}" - cp -f "bazel-bin/src/bazel${EXE_EXT}" "output/bazel${EXE_EXT}" + bazel_build "src:bazel${BAZEL_FLAVOUR}${EXE_EXT}" + cp -f "bazel-bin/src/bazel${BAZEL_FLAVOUR}${EXE_EXT}" "output/bazel${EXE_EXT}" chmod 0755 "output/bazel${EXE_EXT}" BAZEL="$(pwd)/output/bazel${EXE_EXT}" fi @@ -155,7 +155,6 @@ if [ $DO_TESTS ]; then $BAZEL --bazelrc=${BAZELRC} --nomaster_bazelrc test \ --test_tag_filters="${BAZEL_TEST_FILTERS-}" \ --build_tests_only \ - --nolegacy_bazel_java_test \ ${EXTRA_BAZEL_ARGS} \ --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \ -k --test_output=errors //src/... //third_party/ijar/... //scripts/... \ |