diff --git a/build-daemon.sh b/build-daemon.sh
index 30a30fea266b8e3c6657579b5c16ca0d95edc9b9..f516c3389696a73b46e6b15610285b53fd3e2170 100755
--- a/build-daemon.sh
+++ b/build-daemon.sh
@@ -217,9 +217,7 @@ export RING_SRC_DIR="${RING_SRC_DIR}"
 export RING_BUILD_DIR="${RING_BUILD_DIR}"
 
 mkdir -p build-android-${TARGET_TUPLE}
-cd build-android-${TARGET_TUPLE}
 cd ${ANDROID_APP_DIR}
-./make-swig.sh
 
 if [ ! -f config.h ]; then
     echo "Bootstraping"
diff --git a/compile.sh b/compile.sh
index 893edf42f9367e3c26fda9ea02369b4acbd30bfe..8943736151efc93f3e660db67a3eafecda26b075 100755
--- a/compile.sh
+++ b/compile.sh
@@ -6,6 +6,10 @@ if [ -z "$ANDROID_ABI" ]; then
     echo "ANDROID_ABI not provided, building for ${ANDROID_ABI}"
 fi
 
+pushd ring-android
+./make-swig.sh
+popd
+
 ANDROID_ABIS=""
 ANDROID_ABI_LIST="${ANDROID_ABI}"
 echo "Building ABIs: ${ANDROID_ABI_LIST}"