9 files changed, 11 insertions, 23 deletions
diff --git a/toolkit/components/cookie/moz.build b/toolkit/components/cookie/moz.build
index e3ed99703..aac3a838c 100644
--- a/toolkit/components/cookie/moz.build
+++ b/toolkit/components/cookie/moz.build
@@ -4,7 +4,4 @@
 # 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/.
 
-if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
-  DEFINES['MOZ_FENNEC'] = True
-
 JAR_MANIFESTS += ['jar.mn']
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index ce8722910..12e1748e9 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -73,7 +73,7 @@ if CONFIG['MOZ_WEBEXTENSIONS']:
 if CONFIG['ENABLE_INTL_API']:
     DIRS += ['mozintl']
 
-if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
+if not CONFIG['MOZ_FENNEC']:
     DIRS += ['narrate', 'viewsource'];
 
     if CONFIG['NS_PRINTING']:
diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build
index 2dc142882..b06816c34 100644
--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -11,9 +11,9 @@ EXTRA_COMPONENTS += [
     'nsSearchSuggestions.js',
 ]
 
-if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']:
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
     DEFINES['HAVE_SIDEBAR'] = True
-    EXTRA_COMPONENTS += [
+    EXTRA_PP_COMPONENTS += [
     'nsSidebar.js',
     ]
 
diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js
index bbe66ba7e..8abe56d2f 100644
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -4676,9 +4676,9 @@ SearchService.prototype = {
     Services.obs.addObserver(this, SEARCH_ENGINE_TOPIC, false);
     Services.obs.addObserver(this, QUIT_APPLICATION_TOPIC, false);
 
-    if (AppConstants.MOZ_BUILD_APP == "mobile/android") {
-      Services.prefs.addObserver(LOCALE_PREF, this, false);
-    }
+#ifdef MOZ_FENNEC
+    Services.prefs.addObserver(LOCALE_PREF, this, false);
+#endif
 
     // The current stage of shutdown. Used to help analyze crash
     // signatures in case of shutdown timeout.
@@ -4721,9 +4721,9 @@ SearchService.prototype = {
     Services.obs.removeObserver(this, SEARCH_ENGINE_TOPIC);
     Services.obs.removeObserver(this, QUIT_APPLICATION_TOPIC);
 
-    if (AppConstants.MOZ_BUILD_APP == "mobile/android") {
-      Services.prefs.removeObserver(LOCALE_PREF, this);
-    }
+#ifdef MOZ_FENNEC
+    Services.prefs.removeObserver(LOCALE_PREF, this);
+#endif
   },
 
   QueryInterface: XPCOMUtils.generateQI([
diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build
index cc86890bf..de50a82f5 100644
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -17,9 +17,6 @@ if CONFIG['OS_TARGET'] == 'Android':
 if CONFIG['MOZ_ANDROID_CXX_STL'] == 'libc++':
     DEFINES['MOZ_USE_LIBCXX'] = True
 
-if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
-    DEFINES['MOZ_FENNEC'] = True
-
 JAR_MANIFESTS += ['jar.mn']
 
 with Files('aboutTelemetry.*'):
diff --git a/toolkit/locales/moz.build b/toolkit/locales/moz.build
index 91719f14b..0fbac0c89 100644
--- a/toolkit/locales/moz.build
+++ b/toolkit/locales/moz.build
@@ -4,9 +4,6 @@
 # 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/.
 
-if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
-  DEFINES['MOZ_FENNEC'] = True
-
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
   DEFINES['MOZ_GTK'] = True
 
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
index a2caff914..d88975f36 100644
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -22,7 +22,7 @@ endif
 ifndef MOZ_PKG_PLATFORM
 MOZ_PKG_PLATFORM := $(TARGET_OS)-$(TARGET_CPU)
 
-ifeq ($(MOZ_BUILD_APP),mobile/android)
+ifdef MOZ_FENNEC
 MOZ_PKG_PLATFORM := android-$(TARGET_CPU)
 endif
 
diff --git a/toolkit/mozapps/installer/upload-files-APK.mk b/toolkit/mozapps/installer/upload-files-APK.mk
index 9bb5b2e18..f9bfd6735 100644
--- a/toolkit/mozapps/installer/upload-files-APK.mk
+++ b/toolkit/mozapps/installer/upload-files-APK.mk
@@ -23,7 +23,7 @@ GECKO_APP_AP_PATH = $(topobjdir)/mobile/android/base
 
 ifdef ENABLE_TESTS
 INNER_ROBOCOP_PACKAGE=true
-ifeq ($(MOZ_BUILD_APP),mobile/android)
+ifdef MOZ_FENNEC
 UPLOAD_EXTRA_FILES += robocop.apk
 
 # Robocop/Robotium tests, Android Background tests, and Fennec need to
diff --git a/toolkit/mozapps/webextensions/moz.build b/toolkit/mozapps/webextensions/moz.build
index 12640e115..b92915ae8 100644
--- a/toolkit/mozapps/webextensions/moz.build
+++ b/toolkit/mozapps/webextensions/moz.build
@@ -6,9 +6,6 @@
 
 SPHINX_TREES['addon-manager'] = 'docs'
 
-if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
-    DEFINES['MOZ_FENNEC'] = True
-
 DIRS += ['internal']
 TEST_DIRS += ['test']