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

ndk-make.sh: do not modify in-tree Application.mk

Browse source 
Use temporary Application.mk directly via NDK_APPLICATION_MK option.
This commit is contained in:
link2xt 2022-06-12 19:33:49 +00:00
parent 3d0fbf30d2
commit 3b33880fcc
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ndk-make.sh
View file

@ -142,29 +142,22 @@ cd ..
# Set the right arch in Application.mk: # Set the right arch in Application.mk:
oldDotMk="$(cat Application.mk)" oldDotMk="$(cat Application.mk)"
TMP=$(mktemp)
if test $1; then if test $1; then
# Using temporary file because `sed -i` is not portable
TMP=$(mktemp)
sed "s/APP_ABI.*/APP_ABI := $1/g" Application.mk >"$TMP" sed "s/APP_ABI.*/APP_ABI := $1/g" Application.mk >"$TMP"
mv "$TMP" Application.mk
else else
# We are compiling for all architectures: # We are compiling for all architectures:
TMP=$(mktemp)
sed "s/APP_ABI.*/APP_ABI := armeabi-v7a arm64-v8a x86 x86_64/g" Application.mk >"$TMP" sed "s/APP_ABI.*/APP_ABI := armeabi-v7a arm64-v8a x86 x86_64/g" Application.mk >"$TMP"
mv "$TMP" Application.mk
fi fi
cd .. cd ..
ndk-build ndk-build NDK_APPLICATION_MK=$TMP
rm "$TMP"
cd jni
# Restore old Application.mk:
echo "$oldDotMk" > Application.mk
if test $1; then if test $1; then
echo "NDK_ARCH=$1" > ../ndkArch echo "NDK_ARCH=$1" >ndkArch
else else
rm ../ndkArch 2>/dev/null || true # Remove ndkArch, ignore if it doesn't exist rm -f ndkArch # Remove ndkArch, ignore if it doesn't exist
fi fi
echo "ending time: `date`" echo "ending time: `date`"