diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-17 18:35:18 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-18 10:47:44 +0800 |
| commit | e5e7599ff9e946f3d47c6b3150d7265c1e2dab38 (patch) | |
| tree | ba868aeb9e73d3d894a18e3698775580d44d95d7 /tests | |
| parent | cde0cb89ada253e9f7f4194de6f7f6af138b7e09 (diff) | |
| download | ndk-e5e7599ff9e946f3d47c6b3150d7265c1e2dab38.tar.gz | |
Remove GCC 4.6
Change-Id: I840e7a2183e956e27e5dd93357ef2a2dd49fd40b
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/build/warn-noabi/build.sh | 2 | ||||
| -rwxr-xr-x | tests/run-tests-all.sh | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/build/warn-noabi/build.sh b/tests/build/warn-noabi/build.sh index 70cdbe24c..79232fe51 100755 --- a/tests/build/warn-noabi/build.sh +++ b/tests/build/warn-noabi/build.sh @@ -7,7 +7,7 @@ export ANDROID_NDK_ROOT=$NDK NDK_BUILDTOOLS_PATH=$NDK/build/tools . $NDK/build/tools/prebuilt-common.sh -VERSION=4.6 +VERSION=4.8 if [ -n "$NDK_TOOLCHAIN_VERSION" ]; then case "$NDK_TOOLCHAIN_VERSION" in diff --git a/tests/run-tests-all.sh b/tests/run-tests-all.sh index c08f42ab0..eefa0dd2a 100755 --- a/tests/run-tests-all.sh +++ b/tests/run-tests-all.sh @@ -58,8 +58,8 @@ TEST_HOST_32BIT=no TAGS=$HOST_TAG case "$HOST_TAG" in linux-x86_64|darwin-x86_64) - if [ -d "$NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/$HOST_TAG" ] ; then - if [ -d "$NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/$HOST_TAG32" ] ; then + if [ -d "$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/$HOST_TAG" ] ; then + if [ -d "$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/$HOST_TAG32" ] ; then # ideally we should check each individual compiler the presence of 64-bit # but for test script this is fine TEST_HOST_32BIT=yes @@ -71,8 +71,8 @@ case "$HOST_TAG" in ;; windows*) if [ "$ProgramW6432" != "" ] ; then - if [ -d "$NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/windows-x86_64" ] ; then - if [ -d "$NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/windows" ] ; then + if [ -d "$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/windows-x86_64" ] ; then + if [ -d "$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/windows" ] ; then TEST_HOST_32BIT=yes TAGS=$TAGS" windows-x86_64" fi @@ -114,7 +114,7 @@ if [ "$TEST_HOST_32BIT" = "yes" ] ; then done fi -if [ "$SYSTEM" = "linux-x86" -a -d "$NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/windows-x86_64" ] ; then +if [ "$SYSTEM" = "linux-x86" -a -d "$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/windows-x86_64" ] ; then # using 64-bit windows toolchain for V in $NDK_TOOLCHAIN_VERSIONS; do dump "### Running windows-x86_64 $V tests" @@ -122,7 +122,7 @@ if [ "$SYSTEM" = "linux-x86" -a -d "$NDK/toolchains/arm-linux-androideabi-4.6/pr done fi -if [ "$SYSTEM" = "linux-x86" -a -d "$NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/windows" ] ; then +if [ "$SYSTEM" = "linux-x86" -a -d "$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/windows" ] ; then # using 32-bit windows toolchain for V in $NDK_TOOLCHAIN_VERSIONS; do dump "### Running windows $V tests" |