diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-11 19:20:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-11 19:20:54 +0000 |
| commit | c3630d57197abfbb2f46161d0fe468150ec5047a (patch) | |
| tree | d5b509eb890bd7259aa8084c50dbdbdfb96ecee9 | |
| parent | 721aa75ac6c207e0a744d7aabd9c2e3e0f57f70b (diff) | |
| parent | 5948ab94982a26732728cc499a879cf4303e49e8 (diff) | |
| download | ndk-c3630d57197abfbb2f46161d0fe468150ec5047a.tar.gz | |
Merge "Make an ARM only test actually ARM only."
| -rwxr-xr-x | tests/build/check-armeabi-v7a-prebuilts/build.sh | 12 |
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) |