diff options
Diffstat (limited to 'kokoro/ndk-build/build.sh')
| -rwxr-xr-x[-rw-r--r--] | kokoro/ndk-build/build.sh | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/kokoro/ndk-build/build.sh b/kokoro/ndk-build/build.sh index 6d6bdc9..fa80114 100644..100755 --- a/kokoro/ndk-build/build.sh +++ b/kokoro/ndk-build/build.sh @@ -16,42 +16,47 @@ set -e # fail on error set -x # display commands -BUILD_ROOT=$PWD -SRC=$PWD/github/amber +BUILD_ROOT="$PWD" +SRC="$PWD/github/amber" # NDK Path -export ANDROID_NDK=/opt/android-ndk-r16b +export ANDROID_NDK="$BUILD_ROOT/android-ndk-r21" # Get NINJA. wget -q https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip unzip -q ninja-linux.zip export PATH="$PWD:$PATH" -cd $SRC +# Get Android NDK. +wget -q https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip +unzip -q android-ndk-r21-linux-x86_64.zip +# ANDROID_NDK is set earlier. + +cd "$SRC" ./tools/git-sync-deps ./tools/update_build_version.py . samples/ third_party/ ./tools/update_vk_wrappers.py . . mkdir -p build/libs build/app -cd $SRC/build +cd "$SRC/build" # Invoke the build. -BUILD_SHA=${KOKORO_GITHUB_COMMIT:-$KOKORO_GITHUB_PULL_REQUEST_COMMIT} -echo $(date): Starting ndk-build for android_test ... -$ANDROID_NDK/ndk-build \ - -C $SRC/android_test \ +echo "$(date): Starting ndk-build for android_test ..." +"$ANDROID_NDK/ndk-build" \ + -C "$SRC/android_test" \ NDK_PROJECT_PATH=. \ - NDK_LIBS_OUT=`pwd`/libs \ - NDK_APP_OUT=`pwd`/app \ + "NDK_LIBS_OUT=$(pwd)/libs" \ + "NDK_APP_OUT=$(pwd)/app" \ -j8 -echo $(date): ndk-build for android_test completed. -echo $(date): Starting ndk-build for samples ... -$ANDROID_NDK/ndk-build \ - -C $SRC/samples \ +echo "$(date): ndk-build for android_test completed." + +echo "$(date): Starting ndk-build for samples ..." +"$ANDROID_NDK/ndk-build" \ + -C "$SRC/samples" \ NDK_PROJECT_PATH=. \ - NDK_LIBS_OUT=`pwd`/libs \ - NDK_APP_OUT=`pwd`/app \ + "NDK_LIBS_OUT=$(pwd)/libs" \ + "NDK_APP_OUT=$(pwd)/app" \ -j8 -echo $(date): ndk-build for samples completed. +echo "$(date): ndk-build for samples completed." |