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

ndk: update to r23b 

Includes fix for -fno-integrated-as flag, which is needed by libx265
build.
This commit is contained in:
Henrik Grimler 2021-10-22 16:08:49 +02:00
parent a2fdb7679b
commit 6a86fd8b28
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ termux_step_extract_into_massagedir() {
NDK_ARCH=$TERMUX_ARCH
test $NDK_ARCH == 'i686' && NDK_ARCH='i386'
# clang 13 requires libunwind on Android.
cp $TERMUX_STANDALONE_TOOLCHAIN/lib64/clang/12.0.5/lib/linux/$NDK_ARCH/libunwind.a .
cp $TERMUX_STANDALONE_TOOLCHAIN/lib64/clang/12.0.8/lib/linux/$NDK_ARCH/libunwind.a .
for lib in librt.so libpthread.so libutil.so; do
echo 'INPUT(-lc)' > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/$lib

2
scripts/properties.sh
View File

@ -1,6 +1,6 @@
TERMUX_ANDROID_BUILD_TOOLS_VERSION=30.0.3
TERMUX_NDK_VERSION_NUM=23
TERMUX_NDK_REVISION=""
TERMUX_NDK_REVISION="b"
TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64

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

@ -7,7 +7,7 @@ set -e -u
ANDROID_SDK_FILE=commandlinetools-linux-7583922_latest.zip
ANDROID_SDK_SHA256=124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf
ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip
ANDROID_NDK_SHA256=e3eacf80016b91d4cd2c8ca9f34eebd32df912bb799c859cc5450b6b19277b4f
ANDROID_NDK_SHA256=c6e97f9c8cfe5b7be0a9e6c15af8e7a179475b7ded23e2d1c1fa0945d6fb4382
if [ ! -d $ANDROID_HOME ]; then
mkdir -p $ANDROID_HOME
cd $ANDROID_HOME/..