1 files changed, 11 insertions, 1 deletions
diff --git a/tests/build/check-armeabi-v7a-prebuilts/build.sh b/tests/build/check-armeabi-v7a-prebuilts/build.sh
index 10825a7c6..b79ae979c 100755
--- a/tests/build/check-armeabi-v7a-prebuilts/build.sh
+++ b/tests/build/check-armeabi-v7a-prebuilts/build.sh
@@ -216,7 +216,17 @@ check_armv7_elf_binary ()
     fi
 }
 
-. $NDK/build/tools/dev-defaults.sh
+export ANDROID_NDK_ROOT=$NDK
+
+NDK_BUILDTOOLS_PATH=$NDK/build/tools
+. $NDK/build/tools/prebuilt-common.sh
+
+if [ -n "$APP_ABI" ]; then
+    if [ "$(convert_abi_to_arch $APP_ABI)" != "arm" ]; then
+        echo "Skipping ARM only test"
+        exit 0
+    fi
+fi
 
 ARM_TOOLCHAIN_NAME=$(get_default_toolchain_name_for_arch arm)
 ARM_TOOLCHAIN_PREFIX=$(get_default_toolchain_prefix_for_arch arm)