diff --git a/scripts/android-rpc-server.sh b/scripts/android-rpc-server.sh
index 94963cbcd..0373245d4 100755
--- a/scripts/android-rpc-server.sh
+++ b/scripts/android-rpc-server.sh
@@ -13,32 +13,31 @@ KERNEL="$(uname -s | tr '[:upper:]' '[:lower:]')"
 ARCH="$(uname -m)"
 NDK_HOST_TAG="$KERNEL-$ARCH"
 TOOLCHAIN="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/$NDK_HOST_TAG"
-export PATH="$PATH:$TOOLCHAIN/bin/"
 
 PACKAGE="deltachat-rpc-server"
 
 export CARGO_PROFILE_RELEASE_LTO=on
 
 CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang" \
-	CFLAGS=-D__ANDROID_API__=16 \
-	TARGET_CC=armv7a-linux-androideabi16-clang \
-	TARGET_AR=llvm-ar \
+	TARGET_CC="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang" \
+	TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
+	TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
 	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target armv7-linux-androideabi -p $PACKAGE
 
 CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \
-	CFLAGS=-D__ANDROID_API__=21 \
-	TARGET_CC=aarch64-linux-android21-clang \
-	TARGET_AR=llvm-ar \
+	TARGET_CC="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \
+	TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
+	TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
 	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target aarch64-linux-android -p $PACKAGE
 
 CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang" \
-	CFLAGS=-D__ANDROID_API__=16 \
-	TARGET_CC=i686-linux-android16-clang \
-	TARGET_AR=llvm-ar \
+	TARGET_CC="$TOOLCHAIN/bin/i686-linux-android16-clang" \
+	TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
+	TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
 	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target i686-linux-android -p $PACKAGE
 
 CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \
-	CFLAGS=-D__ANDROID_API__=21 \
-	TARGET_CC=x86_64-linux-android21-clang \
-	TARGET_AR=llvm-ar \
+	TARGET_CC="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \
+	TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
+	TARGET_RANLIB="$TOOLCHAIN/bin/llvm-ranlib" \
 	cargo "+$RUSTUP_TOOLCHAIN" rustc --release --target x86_64-linux-android -p $PACKAGE