1 files changed, 14 insertions, 7 deletions
diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build
index 2accffd00..43414963d 100644
--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -4,12 +4,19 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
+EXTRA_COMPONENTS += ['nsSearchSuggestions.js']
 
-if CONFIG['MC_BASILISK'] or CONFIG['HYPE_ICEWEASEL'] or CONFIG['HYPE_ICEDOVE']:
-    DIRS += ['current']
-else:
-    DIRS += ['orginal']
+EXTRA_PP_COMPONENTS += [
+    'nsSearchService.js',
+    'toolkitsearch.manifest',
+]
+
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_XULRUNNER']:
+    DEFINES['HAVE_SIDEBAR'] = True
+    EXTRA_COMPONENTS += ['nsSidebar.js']
+
+EXTRA_JS_MODULES += [
+    'SearchStaticData.jsm',
+    'SearchSuggestionController.jsm',
+]
 
-with Files('**'):
-    BUG_COMPONENT = ('Firefox', 'Search')