Commit 1f92c11c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Remove unused HAVE_X86 variable

parent f307fbf1
...@@ -26,12 +26,10 @@ done ...@@ -26,12 +26,10 @@ done
if [ ${ANDROID_ABI} = "x86" ] ; then if [ ${ANDROID_ABI} = "x86" ] ; then
TARGET_TUPLE="i686-linux-android" TARGET_TUPLE="i686-linux-android"
PATH_HOST="x86" PATH_HOST="x86"
HAVE_X86=1
PLATFORM_SHORT_ARCH="x86" PLATFORM_SHORT_ARCH="x86"
elif [ ${ANDROID_ABI} = "x86_64" ] ; then elif [ ${ANDROID_ABI} = "x86_64" ] ; then
TARGET_TUPLE="x86_64-linux-android" TARGET_TUPLE="x86_64-linux-android"
PATH_HOST="x86_64" PATH_HOST="x86_64"
HAVE_X86=1
HAVE_64=1 HAVE_64=1
PLATFORM_SHORT_ARCH="x86_64" PLATFORM_SHORT_ARCH="x86_64"
elif [ ${ANDROID_ABI} = "mips" ] ; then elif [ ${ANDROID_ABI} = "mips" ] ; then
......
...@@ -54,19 +54,16 @@ if [ "$BUILD" = 0 -a "$FETCH" = 0 ];then ...@@ -54,19 +54,16 @@ if [ "$BUILD" = 0 -a "$FETCH" = 0 ];then
fi fi
HAVE_ARM=0 HAVE_ARM=0
HAVE_X86=0
HAVE_64=0 HAVE_64=0
# Set up ABI variables # Set up ABI variables
if [ ${ANDROID_ABI} = "x86" ] ; then if [ ${ANDROID_ABI} = "x86" ] ; then
TARGET_TUPLE="i686-linux-android" TARGET_TUPLE="i686-linux-android"
PATH_HOST="x86" PATH_HOST="x86"
HAVE_X86=1
PLATFORM_SHORT_ARCH="x86" PLATFORM_SHORT_ARCH="x86"
elif [ ${ANDROID_ABI} = "x86_64" ] ; then elif [ ${ANDROID_ABI} = "x86_64" ] ; then
TARGET_TUPLE="x86_64-linux-android" TARGET_TUPLE="x86_64-linux-android"
PATH_HOST="x86_64" PATH_HOST="x86_64"
HAVE_X86=1
HAVE_64=1 HAVE_64=1
PLATFORM_SHORT_ARCH="x86_64" PLATFORM_SHORT_ARCH="x86_64"
elif [ ${ANDROID_ABI} = "mips" ] ; then elif [ ${ANDROID_ABI} = "mips" ] ; then
...@@ -120,7 +117,6 @@ EOF ...@@ -120,7 +117,6 @@ EOF
export TARGET_TUPLE export TARGET_TUPLE
export PATH_HOST export PATH_HOST
export HAVE_ARM export HAVE_ARM
export HAVE_X86
export HAVE_64 export HAVE_64
export PLATFORM_SHORT_ARCH export PLATFORM_SHORT_ARCH
...@@ -257,7 +253,6 @@ echo "export PATH=$NDK_TOOLCHAIN_PATH:\${ANDROID_SDK}/platform-tools:\${PATH}" > ...@@ -257,7 +253,6 @@ echo "export PATH=$NDK_TOOLCHAIN_PATH:\${ANDROID_SDK}/platform-tools:\${PATH}" >
# CPU flags # CPU flags
echo "export HAVE_ARM=${HAVE_ARM}" >> env.sh echo "export HAVE_ARM=${HAVE_ARM}" >> env.sh
echo "export HAVE_X86=${HAVE_X86}" >> env.sh
echo "export NO_ARMV6=${NO_ARMV6}" >> env.sh echo "export NO_ARMV6=${NO_ARMV6}" >> env.sh
echo "export NO_FPU=${NO_FPU}" >> env.sh echo "export NO_FPU=${NO_FPU}" >> env.sh
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment