diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-11 11:39:30 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-01-11 11:39:54 -0800 |
| commit | 57aa772fc57a0759bfda852dc626b52cca55cbf3 (patch) | |
| tree | db35a636ac7fcca0e6c18e4d893aff83593c6774 | |
| parent | c3630d57197abfbb2f46161d0fe468150ec5047a (diff) | |
| download | ndk-57aa772fc57a0759bfda852dc626b52cca55cbf3.tar.gz | |
Fix test from revert to the old package layout.
Change-Id: I560bcd005025a151acace682c0453ae9b965151b
| -rwxr-xr-x | tests/build/check-armeabi-v7a-prebuilts/build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/build/check-armeabi-v7a-prebuilts/build.sh b/tests/build/check-armeabi-v7a-prebuilts/build.sh index b79ae979c..f37c8ee92 100755 --- a/tests/build/check-armeabi-v7a-prebuilts/build.sh +++ b/tests/build/check-armeabi-v7a-prebuilts/build.sh @@ -252,7 +252,7 @@ case $(uname -s) in ;; esac -ARM_READELF=$NDK/toolchains/$ARM_TOOLCHAIN_NAME/bin/${ARM_TOOLCHAIN_PREFIX}-readelf +ARM_READELF=$NDK/toolchains/$ARM_TOOLCHAIN_NAME/prebuilt/$HOST_TAG/bin/${ARM_TOOLCHAIN_PREFIX}-readelf if [ ! -f "$ARM_READELF" ]; then echo "ERROR: Missing binary: $ARM_READELF" >&2 exit 1 @@ -267,7 +267,7 @@ for ABI in $ARMv7_ABIS; do for VERSION in $DEFAULT_GCC_VERSION_LIST; do - GNUSTL_LIBS=$NDK/sources/cxx-stl/gnu-libstdc++/libs/$ABI + GNUSTL_LIBS=$NDK/sources/cxx-stl/gnu-libstdc++/4.9/libs/$ABI check_armv7_elf_binary $GNUSTL_LIBS/libsupc++.a check_armv7_elf_binary $GNUSTL_LIBS/libgnustl_shared.so check_armv7_elf_binary $GNUSTL_LIBS/libgnustl_static.a |