backout (Bug 630473) - suspected as cause of a big Ts regression on Android 2.2
authorVivien Nicolas <21@vingtetun.org>
Sat, 12 Feb 2011 18:30:56 +0100
changeset 67382 0974043a7bcc6f92a23e99b8a34796fb4a7fcb21
parent 67381 ff66b5e110208fc1686659f9b006fb6c0e9e723d
child 67383 a4bb9c074d13f048767c2bb689e142c941b392f9
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs630473
backout (Bug 630473) - suspected as cause of a big Ts regression on Android 2.2
mobile/components/Makefile.in
mobile/installer/package-manifest.in
--- a/mobile/components/Makefile.in
+++ b/mobile/components/Makefile.in
@@ -47,27 +47,26 @@ MODULE = MobileComponents
 XPIDL_MODULE = MobileComponents
 
 XPIDLSRCS = \
         SessionStore.idl \
         LoginManagerPrompter.idl \
         $(NULL)
 
 EXTRA_PP_COMPONENTS = \
-        MobileComponents.manifest \
         AboutRedirector.js \
         BrowserCLH.js \
         DirectoryProvider.js\
         HelperAppDialog.js \
         Sidebar.js \
         SessionStore.js \
         $(NULL)
 
 EXTRA_COMPONENTS = \
-        AlertsService.js \
+        MobileComponents.manifest \
         BrowserStartup.js \
         ContentPermissionPrompt.js \
         XPIDialogService.js \
         DownloadManagerUI.js \
         PromptService.js \
         ContentDispatchChooser.js \
         AutoCompleteCache.js \
         AddonUpdateService.js \
@@ -76,14 +75,16 @@ EXTRA_COMPONENTS = \
         LoginManagerPrompter.js \
         BlocklistPrompt.js \
         $(NULL)
 
 ifdef MOZ_UPDATER
 EXTRA_COMPONENTS += UpdatePrompt.js
 endif
 
+EXTRA_COMPONENTS += AlertsService.js
+
 ifneq (Android,$(OS_TARGET))
 DIRS =  phone \
         $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/mobile/installer/package-manifest.in
+++ b/mobile/installer/package-manifest.in
@@ -610,17 +610,19 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DL
 #endif
 
 [mobile]
 @BINPATH@/chrome/icons/
 @BINPATH@/chrome/chrome@JAREXT@
 @BINPATH@/chrome/chrome.manifest
 @BINPATH@/components/AboutRedirector.js
 @BINPATH@/components/AddonUpdateService.js
+#ifndef ANDROID
 @BINPATH@/components/AlertsService.js
+#endif
 @BINPATH@/components/AutoCompleteCache.js
 @BINPATH@/components/BlocklistPrompt.js
 @BINPATH@/components/BrowserCLH.js
 @BINPATH@/components/BrowserStartup.js
 @BINPATH@/components/ContentDispatchChooser.js
 @BINPATH@/components/ContentPermissionPrompt.js
 @BINPATH@/components/DirectoryProvider.js
 @BINPATH@/components/DownloadManagerUI.js