Issue #1053 - Remove android blocks from configure.

This commit is contained in:
Moonchild 2021-03-10 17:10:56 +00:00 • committed by roytam1
commit 9985a44c41
2 changed files with 1 additions and 53 deletions

View file

@ -639,15 +639,6 @@ case "$target" in
MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin" MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
;; ;;
*-android*|*-linuxandroid*)
AC_DEFINE(NO_PW_GECOS)
MOZ_GFX_OPTIMIZE_MOBILE=1
MOZ_OPTIMIZE_FLAGS="-O3"
if test -z "$CLANG_CC"; then
MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS"
fi
;;
*-*linux*) *-*linux*)
if test "$GNU_CC" -o "$GNU_CXX"; then if test "$GNU_CC" -o "$GNU_CXX"; then
MOZ_PGO_OPTIMIZE_FLAGS="-O3" MOZ_PGO_OPTIMIZE_FLAGS="-O3"
@ -1429,9 +1420,6 @@ if test "$ac_cv_thread_keyword" = yes; then
mips*-*) mips*-*)
: :
;; ;;
*-android*|*-linuxandroid*)
:
;;
*) *)
AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
;; ;;

View file

@ -849,19 +849,6 @@ case "$target" in
MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin" MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
;; ;;
*-android*|*-linuxandroid*)
AC_DEFINE(NO_PW_GECOS)
if test "$COMPILE_ENVIRONMENT"; then
MOZ_LINKER=1
fi
MOZ_GFX_OPTIMIZE_MOBILE=1
MOZ_OPTIMIZE_FLAGS="-O2"
if test -z "$CLANG_CC"; then
MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS"
fi
;;
*-*linux*) *-*linux*)
if test "$GNU_CC" -o "$GNU_CXX"; then if test "$GNU_CC" -o "$GNU_CXX"; then
MOZ_PGO_OPTIMIZE_FLAGS="-O3" MOZ_PGO_OPTIMIZE_FLAGS="-O3"
@ -1851,9 +1838,6 @@ if test "$ac_cv_thread_keyword" = yes -a "$MOZ_LINKER" != 1; then
mips*-*) mips*-*)
: :
;; ;;
*-android*|*-linuxandroid*)
:
;;
*-openbsd*) *-openbsd*)
: :
;; ;;
@ -2168,30 +2152,6 @@ case "$target_os" in
;; ;;
esac esac
case "${target}" in
*-android*|*-linuxandroid*)
MOZ_THEME_FASTSTRIPE=1
MOZ_RAW=1
;;
esac
# Optional Firefox for Android partner distribution directory.
MOZ_ARG_WITH_STRING(android-distribution-directory,
[ --with-android-distribution-directory=dir
Optional Firefox for Android partner distribution directory.],
MOZ_ANDROID_DISTRIBUTION_DIRECTORY=$withval)
if test -n "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY"; then
# A distribution directory must have an assets/distribution directory.
# See https://wiki.mozilla.org/Mobile/Distribution_Files.
if test ! -d "$MOZ_ANDROID_DISTRIBUTION_DIRECTORY/assets/distribution" ; then
AC_MSG_ERROR([--with-android-distribution-directory does not contain assets/distribution;
(looked for ${MOZ_ANDROID_DISTRIBUTION_DIRECTORY}/assets/distribution).])
fi
fi
AC_SUBST(MOZ_ANDROID_DISTRIBUTION_DIRECTORY)
dnl ======================================================== dnl ========================================================
dnl = Vendor override dnl = Vendor override
dnl ======================================================== dnl ========================================================
@ -2644,7 +2604,7 @@ dnl --enable-webrtc to override. Can disable for everything in
dnl the master list above. dnl the master list above.
if test -n "$MOZ_WEBRTC"; then if test -n "$MOZ_WEBRTC"; then
case "$target" in case "$target" in
*-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
dnl Leave enabled dnl Leave enabled
;; ;;
*) *)