Bug 648407 - Fold NSPR, NSS and SQLite libraries all together on B2G,…

… Android, OSX and Windows. r=blassey,r=cjones,r=bsmedberg
Brli · Mar 17, 2013 · 49b80fd · 49b80fd
1 parent bb1780a
commit 49b80fd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -47,3 +47,5 @@ MOZ_EXTENSION_MANAGER=1
 MOZ_APP_STATIC_INI=1
 
 MOZ_FENNEC=1
+
+MOZ_FOLD_LIBS=1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,3 +47,5 @@ MOZ_EXTENSION_MANAGER=1
		MOZ_APP_STATIC_INI=1

		MOZ_FENNEC=1

		MOZ_FOLD_LIBS=1