Bug 1262052 - Remove unnecessary -mandroid parameter. r?glandium
When target is Android, -mandroid is default parameter from gcc 4.6 So we don't need add this options.
Also clang doesn't support this argument.
MozReview-Commit-ID: AuA3Y9vlgWE
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -43,25 +43,25 @@ case "$target" in
if test -d "$android_platform" ; then
AC_MSG_RESULT([$android_platform])
else
AC_MSG_ERROR([not found. Please check your NDK. With the current configuration, it should be in $android_platform])
fi
CPPFLAGS="-idirafter $android_platform/usr/include $CPPFLAGS"
- CFLAGS="-mandroid -fno-short-enums -fno-exceptions $CFLAGS"
- CXXFLAGS="-mandroid -fno-short-enums -fno-exceptions $CXXFLAGS"
+ CFLAGS="-fno-short-enums -fno-exceptions $CFLAGS"
+ CXXFLAGS="-fno-short-enums -fno-exceptions $CXXFLAGS"
ASFLAGS="-idirafter $android_platform/usr/include -DANDROID $ASFLAGS"
dnl Add -llog by default, since we use it all over the place.
dnl Add --allow-shlib-undefined, because libGLESv2 links to an
dnl undefined symbol (present on the hardware, just not in the
dnl NDK.)
- LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform -llog -Wl,--allow-shlib-undefined $LDFLAGS"
+ LDFLAGS="-L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform -llog -Wl,--allow-shlib-undefined $LDFLAGS"
ANDROID_PLATFORM="${android_platform}"
AC_DEFINE(ANDROID)
AC_SUBST(ANDROID_PLATFORM)
;;
esac