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 | |
| 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')
| -rw-r--r-- | build-android/jni/Application.mk | 2 | ||||
| -rwxr-xr-x | build-android/update_external_sources_android.bat | 2 | ||||
| -rwxr-xr-x | build-android/update_external_sources_android.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/build-android/jni/Application.mk b/build-android/jni/Application.mk index c50afc55..9fc85c66 100644 --- a/build-android/jni/Application.mk +++ b/build-android/jni/Application.mk @@ -15,7 +15,7 @@ APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 APP_PLATFORM := android-22 -APP_STL := gnustl_static +APP_STL := c++_static APP_MODULES := layer_utils VkLayer_core_validation VkLayer_parameter_validation VkLayer_object_tracker VkLayer_threading VkLayer_unique_objects VkLayerValidationTests VulkanLayerValidationTests vkjson_info NDK_TOOLCHAIN_VERSION := clang NDK_MODULE_PATH := . 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. 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 } |