diff options
| author | Cody Northrop <cnorthrop@google.com> | 2017-12-17 22:05:31 -0700 |
|---|---|---|
| committer | Cody Northrop <cnorthrop@google.com> | 2017-12-18 16:57:53 -0700 |
| commit | 16bf4559d30faafcdeda473a380023c60c8d8472 (patch) | |
| tree | ba78ffa98f879dc821efdccbab0669655a744558 /build-android/update_external_sources_android.sh | |
| parent | a90a166fc7ce9600adb2a81b0d6c16d648ac71bd (diff) | |
| download | usermoji-16bf4559d30faafcdeda473a380023c60c8d8472.tar.xz | |
android: Update to NDK r16b
This allows us to switch to libc++ runtime as it is no longer beta:
https://android.googlesource.com/platform/ndk/+/ndk-release-r16/CHANGELOG.md
Diffstat (limited to 'build-android/update_external_sources_android.sh')
| -rwxr-xr-x | build-android/update_external_sources_android.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build-android/update_external_sources_android.sh b/build-android/update_external_sources_android.sh index 01714d02..3d55728a 100755 --- a/build-android/update_external_sources_android.sh +++ b/build-android/update_external_sources_android.sh @@ -182,9 +182,9 @@ function build_shaderc () { echo "Building $BASEDIR/shaderc" cd $BASEDIR/shaderc/android_test if [[ $abi ]]; then - ndk-build THIRD_PARTY_PATH=../third_party APP_ABI=$abi -j $cores; + ndk-build NDK_APPLICATION_MK=../../../jni/shaderc/Application.mk THIRD_PARTY_PATH=../third_party APP_ABI=$abi -j $cores; else - ndk-build THIRD_PARTY_PATH=../third_party -j $cores; + ndk-build NDK_APPLICATION_MK=../../../jni/shaderc/Application.mk THIRD_PARTY_PATH=../third_party -j $cores; fi } |