Merge pull request #7952 from kanru/master

Bug 837839 - Add dogfood only prefs.js support and enable test only SUPL server. r=fabrice
mozilla-b2g · Feb 7, 2013 · 0f16ddb · 0f16ddb
2 parents fd4d202 + b93a6d8
commit 0f16ddb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -349,6 +349,10 @@ EXTENDED_PREF_FILES = \
   payment-prefs.js \
   ua-override-prefs.js \
 
+ifeq ($(DOGFOOD),1)
+EXTENDED_PREF_FILES += dogfood-prefs.js
+endif
+
 # Generate profile/prefs.js
 preferences: install-xulrunner-sdk
 	@test -d profile || mkdir -p profile

diff --git a/build/dogfood-prefs.js b/build/dogfood-prefs.js
@@ -0,0 +1,2 @@
+pref("geo.gps.supl_server", "test.supl.svc.ovi.com");
+pref("geo.gps.supl_port", 7276);