From 748416e5a7654ce6cfce9f680cf4e7a9728bd6be Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Wed, 22 Jan 2014 18:21:18 -0800
Subject: Support APP_ABI=armeabi-v7a-hard

Add a new NDK-only ABI armeabi-v7a-hard in order to solve
-mfloat-abi=hard issue.

1. Note that this is NDK-only ABI.  No known devices
   support armeabi-v7a-hard, and they can't w/o breaking existing float-abi=softfp
   code
2. APP_ABI=armeabi-v7a-hard still installs libraries in libs/armeabi-v7a.
   As a result, armeabi-v7a-hard and armeabi-v7a can't co-exist ("make"
   will ignore one of the "install"), unless when _NDK_TESTING_ALL_=yes for
   internal testing (where lib is installed to libs/armeabi-v7a-hard)
3. Both GCC 4.6/4.8 and Clang3.3/3.4 has additional multilib
   option "-mfloat-abi=hard" to look for libraries in /hard
   sub-directory.
     5be615df32ce970fcccda93cf577e9ce35b1d397 (gcc4.6,4.8)
     7e8798057dc5f28b44b5608fd98fff1cba6909a2 (clang3.4)
     deedd8557b7d82c6931b6942bd39a00127780835 (clang3.3)
4. APP_ABI=all still expand to armeabi,armeabi-v7a,x86,mips

Change-Id: I08c26bfa6580c80260185c2fef398848aebd197d
---
 ndk-gdb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ndk-gdb')

diff --git a/ndk-gdb b/ndk-gdb
index e25caaddc..1bb42342f 100755
--- a/ndk-gdb
+++ b/ndk-gdb
@@ -506,6 +506,8 @@ if [ "$APP_ABIS" != "${APP_ABIS%%all*}" ] ; then
   APP_ABIS_BACK="${APP_ABIS#*all}"
   APP_ABIS="${APP_ABIS_FRONT}${ALL_ABIS}${APP_ABIS_BACK}"
 fi
+# replace "armeabi-v7a-hard" with "armeabi-v7a"
+APP_ABIS=`echo $APP_ABIS | sed -e 's/armeabi-v7a-hard/armeabi-v7a/g'`
 log "ABIs targetted by application: $APP_ABIS"
 
 # Check the ADB command, and that we can connect to the device/emulator
-- 
cgit v1.2.3