From 20da730321b241560b2460e5a5847c24450deb16 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Tue, 2 Oct 2012 04:15:00 +0200
Subject: [PATCH] Fix android build

---
 binr/blob/Makefile   | 5 ++++-
 sys/android-build.sh | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/binr/blob/Makefile b/binr/blob/Makefile
index d90073f493..217b180d86 100644
--- a/binr/blob/Makefile
+++ b/binr/blob/Makefile
@@ -82,6 +82,9 @@ clean:
 	mv main.k main.c
 	rm -f ${BINS2} r2
 
+SOURCES= main.c rabin2.c radare2.c radiff2.c rafind2.c
+SOURCES+=rahash2.c rarun2.c rasm2.c rax2.c ragg2.c
+
 build:
 	mv main.c main.k
 	rm -f *.[ch]
@@ -94,7 +97,7 @@ build:
 		rm -f _$$a ; \
 	done
 	rm -f _*
-	${CC} -o radare2 *.c ${CFLAGS} ${LDFLAGS}
+	${CC} -o radare2 ${SOURCES} ${CFLAGS} ${LDFLAGS}
 	mv main.c main.k
 	rm -f *.[ch]
 	mv main.k main.c
diff --git a/sys/android-build.sh b/sys/android-build.sh
index 604dda348a..023d21064c 100755
--- a/sys/android-build.sh
+++ b/sys/android-build.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+BUILD=1
 PREFIX="/data/data/org.radare.installer/radare2"
 if [ -z "${NDK}" ]; then
 	echo "use ./android-{arm|mips|x86}.sh"
@@ -62,6 +63,7 @@ echo NDK_ARCH: ${NDK_ARCH}
 echo "Using NDK_ARCH: ${NDK_ARCH}"
 echo "Using STATIC_BUILD: ${STATIC_BUILD}"
 
+if [ "${BUILD}" = 1 ]; then
 # start build
 sleep 2
 
@@ -76,6 +78,7 @@ echo ./configure --with-compiler=android --with-ostype=android \
 ./configure --with-compiler=android --with-ostype=android \
 	--without-ewf --without-ssl --prefix=${PREFIX} ${CFGFLAGS} || exit 1
 make -s -j 4 || exit 1
+fi
 rm -rf $D
 mkdir -p $D