From 49b80fdd1bc272d6d730d5abdcceebc3c3ca9d5f Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Sun, 17 Mar 2013 08:02:54 +0100
Subject: [PATCH] Bug 648407 - Fold NSPR, NSS and SQLite libraries all together
 on B2G, Android, OSX and Windows. r=blassey,r=cjones,r=bsmedberg

---
 CLOBBER                    | 2 +-
 b2g/confvars.sh            | 1 +
 browser/confvars.sh        | 3 +++
 mobile/android/confvars.sh | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CLOBBER b/CLOBBER
index 08e2783b44476..f2bb81875ee5a 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -15,4 +15,4 @@
 #
 # 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
diff --git a/b2g/confvars.sh b/b2g/confvars.sh
index 8de6b9ff369d8..7d4f35a89d6c3 100755
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -52,3 +52,4 @@ MOZ_PAY=1
 MOZ_TOOLKIT_SEARCH=
 MOZ_PLACES=
 MOZ_B2G=1
+MOZ_FOLD_LIBS=1
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 3eadf904d3aae..88c8af12c00c1 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -54,3 +54,6 @@ 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
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 6190619c126a1..bda9417d7bc84 100755
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -47,3 +47,5 @@ MOZ_EXTENSION_MANAGER=1
 MOZ_APP_STATIC_INI=1
 
 MOZ_FENNEC=1
+
+MOZ_FOLD_LIBS=1