mirror of
https://github.com/deltachat/deltachat-android.git
synced 2025-10-03 09:49:21 +02:00
Pass APP_ABI to ndk-build instead of creating temporary Application.mk
It's simpler and stores objects inside obj/ in-tree, preventing unnecessary rebuilds.
This commit is contained in:
parent
74b6da430b
commit
2a5efba763
1 changed files with 4 additions and 11 deletions
15
ndk-make.sh
15
ndk-make.sh
|
@ -138,22 +138,15 @@ rm -fr "$TMPLIB"
|
|||
|
||||
echo -- ndk-build --
|
||||
|
||||
cd ..
|
||||
# Set the right arch in Application.mk:
|
||||
oldDotMk="$(cat Application.mk)"
|
||||
cd ../..
|
||||
|
||||
TMP=$(mktemp)
|
||||
if test $1; then
|
||||
sed "s/APP_ABI.*/APP_ABI := $1/g" Application.mk >"$TMP"
|
||||
ndk-build APP_ABI="$1"
|
||||
else
|
||||
# We are compiling for all architectures:
|
||||
sed "s/APP_ABI.*/APP_ABI := armeabi-v7a arm64-v8a x86 x86_64/g" Application.mk >"$TMP"
|
||||
# We are compiling for all architectures defined in Application.mk
|
||||
ndk-build
|
||||
fi
|
||||
|
||||
cd ..
|
||||
ndk-build NDK_APPLICATION_MK=$TMP
|
||||
rm "$TMP"
|
||||
|
||||
if test $1; then
|
||||
echo "NDK_ARCH=$1" >ndkArch
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue