Bug 653091 - Fix broken packaging and really turn off safe browsing [r=mbrubeck]
authorMark Finkle <mfinkle@mozilla.com>
Wed, 27 Apr 2011 09:44:12 -0400
changeset 68673 79b0eb0dcdb794180a3e827b395f3d994e204aba
parent 68672 6622ca2e6bbf018c714810b1e2b47501ab4be8d0
child 68674 53bbbe42d31683355b4d855b91cf14776554b78a
push idunknown
push userunknown
push dateunknown
reviewersmbrubeck
bugs653091
milestone6.0a1
Bug 653091 - Fix broken packaging and really turn off safe browsing [r=mbrubeck]
mobile/confvars.sh
mobile/installer/package-manifest.in
--- a/mobile/confvars.sh
+++ b/mobile/confvars.sh
@@ -39,17 +39,17 @@ MOZ_APP_NAME=fennec
 MOZ_APP_UA_NAME=Fennec
 
 MOZ_APP_VERSION=6.0a1
 
 MOZ_BRANDING_DIRECTORY=mobile/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
-MOZ_SAFE_BROWSING=0
+MOZ_SAFE_BROWSING=
 MOZ_SERVICES_SYNC=1
 
 MOZ_ENABLE_LIBXUL=1
 MOZ_DISABLE_DOMCRYPTO=1
 
 if test "$LIBXUL_SDK"; then
 MOZ_XULRUNNER=1
 else
--- a/mobile/installer/package-manifest.in
+++ b/mobile/installer/package-manifest.in
@@ -400,22 +400,21 @@
 @BINPATH@/components/WeaveCrypto.manifest
 @BINPATH@/components/WeaveCrypto.js
 #endif
 
 ; Modules
 @BINPATH@/modules/*
 
 ; Safe Browsing
-#ifdef MOZ_SAFE_BROWSING
 @BINPATH@/components/nsURLClassifier.manifest
+@BINPATH@/components/nsUrlClassifierHashCompleter.js
 @BINPATH@/components/nsUrlClassifierListManager.js
 @BINPATH@/components/nsUrlClassifierLib.js
 @BINPATH@/components/url-classifier.xpt
-#endif
 
 ; GNOME hooks
 #ifdef MOZ_ENABLE_GNOME_COMPONENT
 @BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
 #endif
 
 ; ANGLE on Win32
 #ifdef XP_WIN32