Bug 1257448 - Don't disable MOZ_MEMORY when building fennec with --disable-compile-environment. r?nalexander draft
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 14 Apr 2016 16:56:36 +0900
changeset 350879 5e68bbd256021e5eeb45e43ef8060a1977de349b
parent 350878 d0ef3b98c087b3a16298c0b25e0411f6408cd70d
child 350880 273338bc520d696d81c2710dd6b217ef7aea1b8c
push id15436
push userbmo:mh+mozilla@glandium.org
push dateThu, 14 Apr 2016 10:42:06 +0000
reviewersnalexander
bugs1257448, 1159371
milestone48.0a1
Bug 1257448 - Don't disable MOZ_MEMORY when building fennec with --disable-compile-environment. r?nalexander This was added in bug 1159371 but doesn't seem necessary anymore.
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -2798,19 +2798,17 @@ case "$target_os" in
         ;;
 esac
 
 case "${target}" in
     *-android*|*-linuxandroid*)
         NSS_DISABLE_DBM=1
         MOZ_THEME_FASTSTRIPE=1
         MOZ_TREE_FREETYPE=1
-        if test "$COMPILE_ENVIRONMENT"; then
-            MOZ_MEMORY=1
-        fi
+        MOZ_MEMORY=1
         MOZ_RAW=1
         ;;
 
 esac
 
 # The app update channel is 'default' when not supplied. The value is used in
 # the application's confvars.sh so it must be set before confvars.sh is called.
 MOZ_ARG_ENABLE_STRING([update-channel],