diff options
| author | Ryan Harrison <zoddicus@users.noreply.github.com> | 2019-07-24 22:29:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 22:29:38 +0300 |
| commit | 65f49dfc397454daa6f5d272e5f83be323d75020 (patch) | |
| tree | 192eed59a3716c6003e9f06fd689f6c3cd069956 /kokoro | |
| parent | c7fcb8c3b9d77ce4d2dd7237f9d51afaf607de53 (diff) | |
Remove unneeded future imports (#2739)
Also, adds explicitly setting python executable in the NDK build script, rewrites
some Python2-isms to 3isms, and formats some code.
Fixes #2738
Diffstat (limited to 'kokoro')
| -rw-r--r-- | kokoro/android/build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kokoro/android/build.sh b/kokoro/android/build.sh index 71d87b681..c5a0a8759 100644 --- a/kokoro/android/build.sh +++ b/kokoro/android/build.sh @@ -44,7 +44,7 @@ mkdir build && cd $SRC/build # Invoke the build. BUILD_SHA=${KOKORO_GITHUB_COMMIT:-$KOKORO_GITHUB_PULL_REQUEST_COMMIT} echo $(date): Starting build... -cmake -DCMAKE_BUILD_TYPE=Release -DANDROID_NATIVE_API_LEVEL=android-14 -DANDROID_ABI="armeabi-v7a with NEON" -DSPIRV_SKIP_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN_PATH -GNinja -DANDROID_NDK=$ANDROID_NDK .. +cmake -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 -DCMAKE_BUILD_TYPE=Release -DANDROID_NATIVE_API_LEVEL=android-14 -DANDROID_ABI="armeabi-v7a with NEON" -DSPIRV_SKIP_TESTS=ON -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN_PATH -GNinja -DANDROID_NDK=$ANDROID_NDK .. echo $(date): Build everything... ninja |