diff options
| author |  Laszlo Csomor <laszlocsomor@google.com> | 2017-07-04 05:45:40 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-07-05 10:57:51 -0400 |
| commit | 9409109c3016c51403ed4387ecda6c99459f1a8d (patch) | |
| tree | a4df58dec6aa7990bf7280785b63abfe9840da03 /scripts/bootstrap | |
| parent | 6c446ac82a23bd803a4881ac84e427325db15e69 (diff) | |
build_windows_jni.sh: move file to subdirectory
The script more logically belongs in
src/main/native/windows than in src/main/native.
Also move the //src/main/native:windows_jni rule
into //src/main/native/windows:windows_jni, so the
logic of building the JNI library is fully
contained in that package.
Change-Id: I96e19003932cc0ddc5af3471b0b31a1aec09b8fa
PiperOrigin-RevId: 160876594
Diffstat (limited to 'scripts/bootstrap')
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index 587c445207..494c1a109e 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -248,12 +248,12 @@ function build_jni() { mkdir -p "$(dirname "$output")" # Keep this `find` command in sync with the `srcs` of - # //src/main/native:windows_jni + # //src/main/native/windows:windows_jni local srcs=$(find src/main/native/windows -name '*.cc' -o -name '*.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} + src/main/native/windows/build_windows_jni.sh "$tmp_output" ${srcs} cp "$tmp_output" "$output" chmod 0555 "$output" |