bug 674880 - Properly set android build options on NDK5+. Patch by Mike Hommey <mh+mozilla@glandium.org>, r=ted
authorted.mielczarek%gmail.com
Thu, 28 Jul 2011 13:08:33 +0000
changeset 4337 94b5dc69e9a2ed10a32763832844198ab5146d8d
parent 4336 0a7e02538d0b54d0afab2a745320dc53bc76e911
child 4338 a868dc8e4218d697cb8ad942f3f02271807a15ab
push idunknown
push userunknown
push dateunknown
reviewersted
bugs674880
bug 674880 - Properly set android build options on NDK5+. Patch by Mike Hommey <mh+mozilla@glandium.org>, r=ted
configure
configure.in
--- a/configure
+++ b/configure
@@ -3115,24 +3115,24 @@ if test "${enable_os2_high_mem+set}" = s
         MOZ_OS2_HIGH_MEMORY=
       else
         MOZ_OS2_HIGH_MEMORY=1
       fi 
 fi
 
 
 
-case "${target}" in
-arm-android-eabi)
+case "${CPU_ARCH}-${OS_TARGET}" in
+arm-Android)
     MOZ_THUMB=yes
     MOZ_ARCH=armv7-a
     MOZ_FPU=vfp
     MOZ_FLOAT_ABI=softfp
     ;;
-arm*-*)
+arm-*)
     if test -n "$MOZ_PLATFORM_MAEMO"; then
         MOZ_THUMB=no
         MOZ_ARCH=armv7-a
         MOZ_FLOAT_ABI=softfp
     fi
     if test "$MOZ_PLATFORM_MAEMO" = 6; then
         MOZ_THUMB=yes
     fi
--- a/configure.in
+++ b/configure.in
@@ -925,24 +925,24 @@ AC_ARG_ENABLE(os2-high-mem,
         MOZ_OS2_HIGH_MEMORY=1
       fi ])
 
 dnl ========================================================
 dnl = ARM toolchain tweaks
 dnl ========================================================
 
 dnl Defaults
-case "${target}" in
-arm-android-eabi)
+case "${CPU_ARCH}-${OS_TARGET}" in
+arm-Android)
     MOZ_THUMB=yes
     MOZ_ARCH=armv7-a
     MOZ_FPU=vfp
     MOZ_FLOAT_ABI=softfp
     ;;
-arm*-*)
+arm-*)
     if test -n "$MOZ_PLATFORM_MAEMO"; then
         MOZ_THUMB=no
         MOZ_ARCH=armv7-a
         MOZ_FLOAT_ABI=softfp
     fi
     if test "$MOZ_PLATFORM_MAEMO" = 6; then
         MOZ_THUMB=yes
     fi