ndk-which still uses no-longer-supported armeabi ABI

[rcombs]

Description

STR:

$ ndk-which gcc
/usr/local/Caskroom/android-ndk/17/android-ndk-r17/prebuilt/darwin-x86_64/bin/../../../build/core/setup-app.mk:79: *** Android NDK: Aborting    .  Stop.
/usr/bin/gcc
$ ndk-which clang
/usr/local/Caskroom/android-ndk/17/android-ndk-r17/prebuilt/darwin-x86_64/bin/../../../build/core/setup-app.mk:79: *** Android NDK: Aborting    .  Stop.
/usr/bin/clang

See relevant code from ndk-which:

get_build_var_for_abi ()
{
    if [ -z "$GNUMAKE" ] ; then
        GNUMAKE=make
    fi
    NDK_PROJECT_PATH=$TMPDIR $GNUMAKE --no-print-dir -f $MYNDKDIR/build/core/build-local.mk DUMP_$1 APP_ABI=$2
}

TOOLCHAIN_PREFIX=`get_build_var_for_abi TOOLCHAIN_PREFIX armeabi`

And from setup-app.mk:

_bad_abis = $(strip $(filter-out $(NDK_ALL_ABIS),$(NDK_APP_ABI)))
ifneq ($(_bad_abis),)
    ifneq ($(filter $(_bad_abis),armeabi-v7a-hard),)
        $(call __ndk_info,armeabi-v7a-hard is no longer supported. Use armeabi-v7a.)
        $(call __ndk_info,See https://android.googlesource.com/platform/ndk/+/master/docs/HardFloatAbi.md)
    else ifneq ($(filter $(_bad_abis),armeabi),)
        $(call __ndk_info,The armeabi ABI is no longer supported. Use armeabi-v7a.)
    else ifneq ($(filter $(_bad_abis),mips mips64),)
        $(call __ndk_info,MIPS and MIPS64 are no longer supported.)
    endif
    $(call __ndk_info,NDK Application '$(_app)' targets unknown ABI(s): $(_bad_abis))
    $(call __ndk_info,Please fix the APP_ABI definition in $(NDK_APP_APPLICATION_MK))
    $(call __ndk_error,Aborting)
endif

Related to #56. I'd say that the proposed new flag from that issue should be added, and the default should be changed to… I guess armeabi-v7a?

Environment Details

• NDK Version: r17
• Build system: N/A
• Host OS: macOS
• Compiler: N/A
• ABI: N/A
• STL: N/A
• NDK API level: N/A
• Device API level: N/A

[enh]

https://android-review.googlesource.com/c/platform/ndk/+/722891 added --abi and switched the default.

https://android-review.googlesource.com/c/platform/ndk/+/723009 cherrypicked this for r18 beta 2.

[DanAlbert]

Merged into r18.