Update to use NDK r12

diff --git a/build-package.sh b/build-package.sh
index 34e9181803b9a86d5560bf6f9fc04b88334ae0c4..6ab780cc1ce16e6210072715b152aa4e750d7267 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -18,7 +18,7 @@ test -f $HOME/.termuxrc && . $HOME/.termuxrc
 : ${TERMUX_PROCESS_DEB:=""}
 : ${TERMUX_API_LEVEL:="21"}
 : ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.3"}
-: ${TERMUX_NDK_VERSION:="11"}
+: ${TERMUX_NDK_VERSION:="12"}
 
 # Handle command-line arguments:
 show_usage () {
@@ -51,7 +51,7 @@ else
 fi
 
 # Compute standalone toolchain dir, bitness of arch and name of host platform:
-TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-"
+TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/android-standalone-toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}-"
 if [ "$TERMUX_CLANG" = "" ]; then
        TERMUX_STANDALONE_TOOLCHAIN+="gcc4.9"
 else

diff --git a/packages/libgcc/build.sh b/packages/libgcc/build.sh
index f7292cc77b88f67be566a67622322731693ef21f..44e948e87ed27aaf23fd2f3022859f0f0023f0df 100644 (file)
--- a/packages/libgcc/build.sh
+++ b/packages/libgcc/build.sh
@@ -6,11 +6,6 @@ TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
 termux_step_extract_into_massagedir () {
         mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/
 
-
-       if [ "$TERMUX_CLANG" = "" ]; then
-               LIBGCC_PATH=lib/gcc/$TERMUX_HOST_PLATFORM/4.9/libgcc.a
-       else
-               LIBGCC_PATH=lib/gcc/$TERMUX_HOST_PLATFORM/4.9.x/libgcc.a
-       fi
+       LIBGCC_PATH=lib/gcc/$TERMUX_HOST_PLATFORM/4.9.x/libgcc.a
        cp $TERMUX_STANDALONE_TOOLCHAIN/$LIBGCC_PATH $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/
 }

diff --git a/packages/ndk-stl/build.sh b/packages/ndk-stl/build.sh
index 4811fc20045f99a7e90897b5978dba98c32e2cf5..b5fc10fdc31aa2c26181bbe8f2b184a88add92c5 100644 (file)
--- a/packages/ndk-stl/build.sh
+++ b/packages/ndk-stl/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_NO_DEVELSPLIT=yes
 
 termux_step_extract_into_massagedir () {
         mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/
-       cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/
+       cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9.x/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/
 
        if [ $TERMUX_ARCH = arm ]; then
                cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/arm-linux-androideabi/armv7-a/bits/* \

diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh
index 8ff8379332167c23118e94a08c7e8ca59b9fff06..b9303ea24da7e395dee90aee7cddfc8c6e97892e 100755 (executable)
--- a/scripts/setup-android-sdk.sh
+++ b/scripts/setup-android-sdk.sh
@@ -10,7 +10,7 @@ if [ ! -d $ANDROID_HOME ]; then
        mkdir -p $ANDROID_HOME
        cd $ANDROID_HOME/..
        rm -Rf `basename $ANDROID_HOME`
-       curl -o android-sdk.tgz http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz
+       curl --fail --retry 3 -o android-sdk.tgz https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
 
        rm -Rf android-sdk-linux
        tar xzf android-sdk.tgz
@@ -22,11 +22,11 @@ if [ ! -d $NDK ]; then
        mkdir -p $NDK
        cd $NDK/..
        rm -Rf `basename $NDK`
-       curl -o ndk.zip http://dl.google.com/android/repository/android-ndk-r11-linux-x86_64.zip
+       curl --fail --retry 3 -o ndk.zip http://dl.google.com/android/repository/android-ndk-r12-linux-x86_64.zip
 
-       rm -Rf android-ndk-r11
+       rm -Rf android-ndk-r12
        unzip -q ndk.zip
-       mv android-ndk-r11 `basename $NDK`
+       mv android-ndk-r12 `basename $NDK`
        rm ndk.zip
 fi