From 5948ab94982a26732728cc499a879cf4303e49e8 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 11 Jan 2016 10:47:47 -0800 Subject: Make an ARM only test actually ARM only. Change-Id: Ia88c2f4879e8a10a398b7d86316b45c560cb6049 --- tests/build/check-armeabi-v7a-prebuilts/build.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3