diff --git a/builds/android/android_build_helper.sh b/builds/android/android_build_helper.sh index 5745561d..f1abbf26 100644 --- a/builds/android/android_build_helper.sh +++ b/builds/android/android_build_helper.sh @@ -80,12 +80,12 @@ function android_build_env { if [ -z "$TOOLCHAIN_PATH" ]; then ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_PATH environment variable") - ANDROID_BUILD_FAIL+=(" (eg. \"/home/user/android/android-ndk-r11c/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin\")") + ANDROID_BUILD_FAIL+=(" (eg. \"/home/user/android/android-ndk-r11c/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin\")") fi if [ -z "$TOOLCHAIN_NAME" ]; then ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_NAME environment variable") - ANDROID_BUILD_FAIL+=(" (eg. \"arm-linux-androideabi-4.8\")") + ANDROID_BUILD_FAIL+=(" (eg. \"arm-linux-androideabi-4.9\")") fi if [ -z "$TOOLCHAIN_HOST" ]; then @@ -210,21 +210,21 @@ function _android_build_opts_process_cxx_stl { ;; esac ;; - gnustl_shared_48) + gnustl_shared_49) LIBS+=" -lgnustl_shared" - CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/include" + CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/include" case "${TOOLCHAIN_ARCH}" in arm) - LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi" - CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi/include" + LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi" + CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include" ;; x86) - LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86" - CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include" + LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86" + CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include" ;; mips) - LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips" - CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips/include" + LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips" + CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include" ;; *) ANDROID_BUILD_FAIL+=("Unknown combination for ANDROID_BUILD_CXXSTL and TOOLCHAIN_ARCH") diff --git a/builds/android/build.sh b/builds/android/build.sh index 9d4d70db..2e3515ba 100755 --- a/builds/android/build.sh +++ b/builds/android/build.sh @@ -8,7 +8,7 @@ ANDROID_BUILD_DIR="$(pwd)" source ${ANDROID_BUILD_DIR}/android_build_helper.sh # Choose a C++ standard library implementation from the ndk -ANDROID_BUILD_CXXSTL="gnustl_shared_48" +ANDROID_BUILD_CXXSTL="gnustl_shared_49" # Set up android build environment and set ANDROID_BUILD_OPTS array android_build_env