Fix android build

binr/blob/Makefile

@@ -6,10 +6,12 @@ BINS2=radare2 ${BINS}
 
 include ../../config-user.mk
 
+ifneq (${ANDROID},1)
 ifneq (${OSTYPE},linux)
 LDFLAGS+=-lpthread
 LDFLAGS+=-ldl
 endif
+endif
 
 CFLAGS=-I ../../libr/include/
 CFLAGS+=-DLIBDIR="\"${LIBDIR}\""

binr/rules.mk

@@ -27,9 +27,11 @@ LDFLAGS+=../../shlr/gdb/lib/libgdbr.a
 LDFLAGS+=../../shlr/wind/libr_wind.a
 LDFLAGS+=../../shlr/capstone/libcapstone.a
 LDFLAGS+=../../shlr/java/libr_java.a
+ifneq (${ANDROID},1)
 ifneq (${OSTYPE},linux)
 LDFLAGS+=-lpthread
 endif
+endif
 ifneq (${OSTYPE},haiku)
 LDFLAGS+=-lm
 endif

sys/android-build.sh

@@ -89,8 +89,9 @@ if [ "${BUILD}" = 1 ]; then
 		echo "Missing NDK env var. Use ./android-{arm|aarch64|mips|mips64|x86}.sh"
 		exit 1
 	fi
+	export ANDROID=1
 	# start build
-	sleep 2
+	sleep 1
 
 	make mrproper
 	if [ $STATIC_BUILD = 1 ]; then

sys/android-shell.sh

@@ -5,6 +5,7 @@ if [ -n "$1" ]; then
 	NDK_ARCH="$1"
 	shift
 fi
+export ANDROID=1
 case "${NDK_ARCH}" in
 mips64)
 	AR=mips64el-linux-android-ar
@@ -27,6 +28,9 @@ arm)
 	AR=arm-linux-androideabi-ar
 	RANLIB=arm-linux-androideabi-ranlib
 	;;
+local)
+	export ANDROID=1
+	;;
 *)
 	echo "Usage: $0 [aarch64|arm|mips|mips64|x86]"
 	exit 1