aboutsummaryrefslogtreecommitdiff
path: root/build-android/update_external_sources_android.bat
diff options
context:
space:
mode:
authorCody Northrop <cnorthrop@google.com>2017-12-17 22:05:31 -0700
committerCody Northrop <cnorthrop@google.com>2017-12-18 16:57:53 -0700
commit16bf4559d30faafcdeda473a380023c60c8d8472 (patch)
treeba78ffa98f879dc821efdccbab0669655a744558 /build-android/update_external_sources_android.bat
parenta90a166fc7ce9600adb2a81b0d6c16d648ac71bd (diff)
downloadusermoji-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.bat')
-rwxr-xr-xbuild-android/update_external_sources_android.bat2
1 files changed, 1 insertions, 1 deletions
diff --git a/build-android/update_external_sources_android.bat b/build-android/update_external_sources_android.bat
index 16ce1ce8..886625df 100755
--- a/build-android/update_external_sources_android.bat
+++ b/build-android/update_external_sources_android.bat
@@ -279,7 +279,7 @@ goto:eof
echo Building %SHADERC_DIR%
cd %SHADERC_DIR%\android_test
echo Building shaderc with Android NDK
- call ndk-build THIRD_PARTY_PATH=../third_party -j 4
+ call ndk-build NDK_APPLICATION_MK=../../../jni/shaderc/Application.mk THIRD_PARTY_PATH=../third_party -j 4
REM Check for existence of one lib, even though we should check for all results
if not exist %SHADERC_DIR%\android_test\obj\local\x86\libshaderc.a (
echo.