Bug 1257448 - Don't disable MOZ_MEMORY when building fennec with --disable-compile-environment. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 14 Apr 2016 16:56:36 +0900
changeset 331181 b848122c64f90b399ab0d871341ce412cc9db993
parent 331180 334804a9afacc402b16c172a97bb85919510a8e8
child 331182 19192644236646c8c4bec4d475bc3fd628608846
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1257448, 1159371
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
@@ -2796,19 +2796,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],