diff options
| author |  Laszlo Csomor <laszlocsomor@google.com> | 2016-09-28 08:11:42 +0000 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2016-09-28 08:30:23 +0000 |
| commit | 1047bbbb4a024ccc372f1464f8439764b233a1a8 (patch) | |
| tree | 0c74352d56eccc692d02bb579c188dfcda9bfd61 /scripts/bootstrap | |
| parent | 92f06a540fe07a424fc929a5f8ab1ebd696dd62d (diff) | |
Windows, bootstrapping: do not build JNI library.
Since commit 94d905836c167a21d2321d26c646fde07f5fc522 we no longer need JNI for WindowsFileSystem.isJunction.
This is a partial rollback of commit 4a249b6962d32ed4cfd4165dfdae4a555b00bb69.
Affects https://github.com/bazelbuild/bazel/issues/1680
--
MOS_MIGRATED_REVID=134506403
Diffstat (limited to 'scripts/bootstrap')
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index c72b9f722e..a5141e835e 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -251,45 +251,6 @@ exit $? EOF chmod 0755 ${ARCHIVE_DIR}/_embedded_binaries/process-wrapper${EXE_EXT} -function build_jni() { - local output_dir=$1 - local jni_lib_name="windows_jni.dll" - local output="${output_dir}/${jni_lib_name}" - local tmp_output="${NEW_TMPDIR}/jni/${jni_lib_name}" - mkdir -p "$(dirname "$tmp_output")" - - case "${PLATFORM}" in - msys*|mingw*) - log "Building Windows JNI library..." - - # We have to enable JNI on Windows because some filesystem operations are - # not (and cannot be) implemented in Java. - ENABLE_JNI=1 - - # Let the JVM know where to find the JNI library. This flag overrides the - # default value for java.library.path, but since JNI is disabled by default, - # that path would be ignored anyway. - JNI_PATH="$output_dir" - - # Keep this `find` command in sync with the `srcs` of - # //src/main/native:windows_jni - local srcs=$(find src/main/native \ - -name 'windows_*.cc' -o -name 'windows_*.h') - [ -n "$srcs" ] || fail "Could not find sources for Windows JNI library" - - # do not quote $srcs because we need to expand it to multiple args - src/main/native/build_windows_jni.sh "$tmp_output" ${srcs} - - cp "$tmp_output" "$output" - chmod 0755 "$output" - ;; - esac -} - -ENABLE_JNI=0 -JNI_PATH="" -build_jni "${ARCHIVE_DIR}/_embedded_binaries" - cp src/main/tools/build_interface_so ${ARCHIVE_DIR}/_embedded_binaries/build_interface_so cp src/main/tools/jdk.BUILD ${ARCHIVE_DIR}/_embedded_binaries/jdk.BUILD cp $OUTPUT_DIR/libblaze.jar ${ARCHIVE_DIR} @@ -309,8 +270,7 @@ function run_bazel_jar() { -XX:+HeapDumpOnOutOfMemoryError -Xverify:none -Dfile.encoding=ISO-8859-1 \ -XX:HeapDumpPath=${OUTPUT_DIR} \ -Djava.util.logging.config.file=${OUTPUT_DIR}/javalog.properties \ - -Dio.bazel.EnableJni=${ENABLE_JNI} \ - -Djava.library.path="$JNI_PATH" \ + -Dio.bazel.EnableJni=0 \ -jar ${ARCHIVE_DIR}/libblaze.jar \ --batch \ --install_base=${ARCHIVE_DIR} \ |