Skip to content
Snippets Groups Projects
Commit c36b3331 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

build: cleanup

Change-Id: I5737f7577350d8e59d44d068d7bce180bfd47bf3
parent 06d1a212
No related branches found
No related tags found
No related merge requests found
...@@ -18,33 +18,23 @@ arch=`uname -m` ...@@ -18,33 +18,23 @@ arch=`uname -m`
ANDROID_TOPLEVEL_DIR="`pwd`" ANDROID_TOPLEVEL_DIR="`pwd`"
ANDROID_APP_DIR="${ANDROID_TOPLEVEL_DIR}/ring-android" ANDROID_APP_DIR="${ANDROID_TOPLEVEL_DIR}/ring-android"
HAVE_ARM=0
HAVE_X86=0
HAVE_64=0
# Set up ABI variables # Set up ABI variables
if [ ${ANDROID_ABI} = "x86" ] ; then if [ ${ANDROID_ABI} = "x86" ] ; then
TARGET="i686-linux-android" TARGET="i686-linux-android"
PJ_TARGET="i686-pc-linux-android" PJ_TARGET="i686-pc-linux-android"
HAVE_X86=1
PLATFORM_SHORT_ARCH="x86" PLATFORM_SHORT_ARCH="x86"
elif [ ${ANDROID_ABI} = "x86_64" ] ; then elif [ ${ANDROID_ABI} = "x86_64" ] ; then
TARGET="x86_64-linux-android" TARGET="x86_64-linux-android"
PJ_TARGET="x86_64-pc-linux-android" PJ_TARGET="x86_64-pc-linux-android"
HAVE_X86=1
HAVE_64=1
PLATFORM_SHORT_ARCH="x86_64" PLATFORM_SHORT_ARCH="x86_64"
elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then elif [ ${ANDROID_ABI} = "arm64-v8a" ] ; then
TARGET="aarch64-linux-android" TARGET="aarch64-linux-android"
PJ_TARGET="aarch64-unknown-linux-android" PJ_TARGET="aarch64-unknown-linux-android"
HAVE_ARM=1
HAVE_64=1
PLATFORM_SHORT_ARCH="arm64" PLATFORM_SHORT_ARCH="arm64"
else else
TARGET_CC="armv7a-linux-androideabi" TARGET_CC="armv7a-linux-androideabi"
TARGET="arm-linux-androideabi" TARGET="arm-linux-androideabi"
PJ_TARGET="arm-unknown-linux-androideabi" PJ_TARGET="arm-unknown-linux-androideabi"
HAVE_ARM=1
PLATFORM_SHORT_ARCH="arm" PLATFORM_SHORT_ARCH="arm"
fi fi
TARGET_CC=${TARGET_CC:-$TARGET} TARGET_CC=${TARGET_CC:-$TARGET}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment