yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-04 02:09:39 +02:00
Code Issues Releases Wiki Activity

Pass APP_ABI to ndk-build instead of creating temporary Application.mk

Browse source 
It's simpler and stores objects inside obj/ in-tree,
preventing unnecessary rebuilds.
This commit is contained in:
link2xt 2022-07-06 00:00:00 +00:00
parent 74b6da430b
commit 2a5efba763
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ndk-make.sh
View file

@ -138,22 +138,15 @@ rm -fr "$TMPLIB"
echo -- ndk-build -- echo -- ndk-build --
cd .. cd ../..
# Set the right arch in Application.mk:
oldDotMk="$(cat Application.mk)"
TMP=$(mktemp)
if test $1; then if test $1; then
sed "s/APP_ABI.*/APP_ABI := $1/g" Application.mk >"$TMP" ndk-build APP_ABI="$1"
else else
# We are compiling for all architectures: # We are compiling for all architectures defined in Application.mk
sed "s/APP_ABI.*/APP_ABI := armeabi-v7a arm64-v8a x86 x86_64/g" Application.mk >"$TMP" ndk-build
fi fi
cd ..
ndk-build NDK_APPLICATION_MK=$TMP
rm "$TMP"
if test $1; then if test $1; then
echo "NDK_ARCH=$1" >ndkArch echo "NDK_ARCH=$1" >ndkArch
else else