sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to use NDK r12

Browse Source
This commit is contained in:
Fredrik Fornwall 2016-06-10 10:45:16 -04:00
parent 46d6cb73f2
commit 202ed9d3b3
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-package.sh
View File

@ -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

7
packages/libgcc/build.sh
View File

@ -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/
}

2
packages/ndk-stl/build.sh
View File

@ -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/* \

8
scripts/setup-android-sdk.sh
View File

@ -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