Fix bustage on non-android platforms; r=fabrice
authorEd Morley <bmo@edmorley.co.uk>
Sat, 15 Oct 2011 22:57:57 +0100
changeset 82359 19a597a694a70deeef3bdaa7cc59d9457fbddc91
parent 82358 8066987d39e0fa2d56431734192d199c01d1c6dc
child 82360 94192995b385ebd0ca09a7f2493ceb38a7744724
push id628
push userclegnitto@mozilla.com
push dateWed, 21 Dec 2011 14:41:57 +0000
treeherdermozilla-aurora@24a61ad789e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice
milestone10.0a1
Fix bustage on non-android platforms; r=fabrice
configure.in
toolkit/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -4343,17 +4343,17 @@ MOZ_PERMISSIONS=1
 MOZ_PLACES=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_PROFILELOCKING=1
 MOZ_PSM=1
 MOZ_RDF=1
 MOZ_REFLOW_PERF=
 MOZ_SAFE_BROWSING=
 MOZ_HELP_VIEWER=
-MOZ_SPELLCHECK=
+MOZ_SPELLCHECK=1
 MOZ_SVG_DLISTS=
 MOZ_TOOLKIT_SEARCH=1
 MOZ_UI_LOCALE=en-US
 MOZ_UNIVERSALCHARDET=1
 MOZ_URL_CLASSIFIER=
 MOZ_XTF=1
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
@@ -4399,16 +4399,17 @@ case "${target}" in
         fi
 
         NSS_DISABLE_DBM=1
         MOZ_INSTALLER=
         NECKO_WIFI=
         MOZ_THEME_FASTSTRIPE=1
         MOZ_TREE_FREETYPE=1
         MOZ_MEMORY=1
+        MOZ_SPELLCHECK=
         ;;
 esac
 
 MOZ_ARG_ENABLE_STRING(application,
 [  --enable-application=APP
                           Options include:
                             browser (Firefox)
                             xulrunner
--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -57,21 +57,21 @@ PARALLEL_DIRS = \
   mozapps/update \
   mozapps/xpinstall \
   mozapps/webapps \
   obsolete \
   profile \
   themes \
   $(NULL)
 
-#
+
 # The native front end is not going to use extensions based on this code.
 # If it isn't used, it still takes up .5mb in cached statement.  fail for me.
 # Ideally we start moving other optional stuff into this section.
-ifdef XXXXX 
+ifneq ($(OS_TARGET),Android)
 PARALLEL_DIRS += \
   mozapps/extensions \
   $(NULL)
 endif
 
 ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
 PARALLEL_DIRS += system/unixproxy
 endif