diff options
author | Dan Albert <danalbert@google.com> | 2016-01-11 19:00:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-11 19:00:25 +0000 |
commit | 6f0f7c70ba69143e9681aea4de54374492e466dd (patch) | |
tree | 26b32e0d6d44d0fd9b6c740e002a55bfe951a152 | |
parent | ae836939d5061fdb1c9115a7bf37bca892899e04 (diff) | |
parent | b8b0981ddf7e64a5d18662146f396aa92de86747 (diff) | |
download | ndk-6f0f7c70ba69143e9681aea4de54374492e466dd.tar.gz |
Merge "Remove a pointless and obsolete test."
-rwxr-xr-x | tests/build/warn-noabi/build.sh | 51 | ||||
-rw-r--r-- | tests/build/warn-noabi/jni/Android.mk | 1 | ||||
-rw-r--r-- | tests/build/warn-noabi/jni/Application.mk | 1 |
3 files changed, 0 insertions, 53 deletions
diff --git a/tests/build/warn-noabi/build.sh b/tests/build/warn-noabi/build.sh deleted file mode 100755 index 651801a83..000000000 --- a/tests/build/warn-noabi/build.sh +++ /dev/null @@ -1,51 +0,0 @@ -# Check if ARM g++ no longer gives pointless warning about the mangling of <va_list> has changed in GCC 4.4 -# See https://android-review.googlesource.com/#/c/42274/ -# - -export ANDROID_NDK_ROOT=$NDK - -NDK_BUILDTOOLS_PATH=$NDK/build/tools -. $NDK/build/tools/prebuilt-common.sh - -VERSION=4.9 - -if [ -n "$NDK_TOOLCHAIN_VERSION" ]; then - case "$NDK_TOOLCHAIN_VERSION" in - 4.9*) - VERSION=$NDK_TOOLCHAIN_VERSION - ;; - clang*) - echo "No need to test clang on this issue" - exit 0 - ;; - *) - echo "ERROR: invalid NDK_TOOLCHAIN_VERSION $NDK_TOOLCHAIN_VERSION" - exit 1 - esac -fi - -SYSTEM=$(get_prebuilt_host_tag) -if [ "$SYSTEM" = "windows" ] ; then - SYSTEM64=windows-x86_64 - NULL="NUL" -else - SYSTEM64=${SYSTEM}_64 - NULL="/dev/null" -fi - -ARM_GPP=$NDK/toolchains/arm-linux-androideabi-$VERSION/bin/arm-linux-androideabi-g++${HOST_EXE} -if [ ! -f "$ARM_GPP" ]; then - echo "ERROR: Can't locate compiler $ARM_GPP" - exit 1 -fi - -OUT=$(echo "#include <stdarg.h> -void foo(va_list v) { }" | $ARM_GPP -x c++ -c -o $NULL - 2>&1) - -if [ -z "$OUT" ]; then - echo "ARM g++ no longer gives pointless warning about the mangling of <va_list> has changed in GCC 4.4" - exit 0 -else - echo "ERROR: ARM g++ still gives pointless warning about the mangling of <va_list> has changed in GCC 4.4" - exit 1 -fi diff --git a/tests/build/warn-noabi/jni/Android.mk b/tests/build/warn-noabi/jni/Android.mk deleted file mode 100644 index 2f42ab63d..000000000 --- a/tests/build/warn-noabi/jni/Android.mk +++ /dev/null @@ -1 +0,0 @@ -LOCAL_PATH:= $(call my-dir) diff --git a/tests/build/warn-noabi/jni/Application.mk b/tests/build/warn-noabi/jni/Application.mk deleted file mode 100644 index ab9f5e354..000000000 --- a/tests/build/warn-noabi/jni/Application.mk +++ /dev/null @@ -1 +0,0 @@ -APP_ABI := armeabi armeabi-v7a armeabi-v7a-hard
\ No newline at end of file |