Bug 648407 - Fold NSPR, NSS and SQLite libraries all together on B2G, Android, OSX and Windows. r=blassey,r=cjones,r=bsmedberg
authorMike Hommey <mh+mozilla@glandium.org>
Sun, 17 Mar 2013 08:02:54 +0100
changeset 135512 10153343281df79504f74f3b1f3380ba0e5135c4
parent 135511 c03af1a12d8428fbf7abb682a2138bbf0664d5e2
child 135513 3630976c4dd9c1efa09d62aae55fd540f2f48943
push id2452
push userlsblakk@mozilla.com
push dateMon, 13 May 2013 16:59:38 +0000
treeherdermozilla-beta@d4b152d29d8d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey, cjones, bsmedberg
bugs648407
milestone22.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 648407 - Fold NSPR, NSS and SQLite libraries all together on B2G, Android, OSX and Windows. r=blassey,r=cjones,r=bsmedberg
CLOBBER
b2g/confvars.sh
browser/confvars.sh
mobile/android/confvars.sh
--- a/CLOBBER
+++ b/CLOBBER
@@ -10,9 +10,9 @@
 #                  O   <-- Users coming from both parents need to Clobber
 #               /     \
 #          O               O
 #          |               |
 #          O <-- Clobber   O  <-- Clobber
 #
 # Note: The description below will be part of the error message shown to users.
 #
-Bug 838652 requires a clobber
+Bug 648407 - Fold NSPR, NSS and SQLite libraries all together on B2G, Android, OSX and Windows
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -47,8 +47,9 @@ MOZ_EXTENSION_MANAGER=1
 MOZ_SYS_MSG=1
 MOZ_TIME_MANAGER=1
 
 MOZ_B2G_CERTDATA=1
 MOZ_PAY=1
 MOZ_TOOLKIT_SEARCH=
 MOZ_PLACES=
 MOZ_B2G=1
+MOZ_FOLD_LIBS=1
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -49,8 +49,11 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3
 ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=firefox-mozilla-central
 MOZ_PROFILE_MIGRATOR=1
 MOZ_EXTENSION_MANAGER=1
 MOZ_APP_STATIC_INI=1
 MOZ_WEBAPP_RUNTIME=1
 MOZ_MEDIA_NAVIGATOR=1
+if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
+  MOZ_FOLD_LIBS=1
+fi
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -42,8 +42,10 @@ MOZ_ONLY_TOUCH_EVENTS=1
 
 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
 
 MOZ_ANDROID_OMTC=1
 MOZ_EXTENSION_MANAGER=1
 MOZ_APP_STATIC_INI=1
 
 MOZ_FENNEC=1
+
+MOZ_FOLD_LIBS=1