From 11a8a39f6d2e057d51559c52c1bf0ba74bbfe189 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Thu, 1 Mar 2018 14:26:41 -0500
Subject: Use MOZ_FENNEC and MOZ_XULRUNNER instead of checking MOZ_BUILD_APP in
 most places

---
 dom/base/moz.build     | 4 ++--
 dom/bindings/moz.build | 2 +-
 dom/push/moz.build     | 2 +-
 dom/webidl/moz.build   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'dom')

diff --git a/dom/base/moz.build b/dom/base/moz.build
index 0bc9902e4..686d76e73 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -411,7 +411,7 @@ EXTRA_COMPONENTS += [
 ]
 
 # Firefox for Android provides an alternate version of this component
-if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
+if not CONFIG['MOZ_FENNEC']:
     EXTRA_COMPONENTS += [
         'SiteSpecificUserAgent.js',
         'SiteSpecificUserAgent.manifest',
@@ -472,7 +472,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
-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
 
 if CONFIG['MOZ_X11']:
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index eb00482c6..f1ce9e276 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -139,7 +139,7 @@ FINAL_LIBRARY = 'xul'
 SPHINX_TREES['webidl'] = 'docs'
 SPHINX_PYTHON_PACKAGE_DIRS += ['mozwebidlcodegen']
 
-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']:
     # This is needed for Window.webidl
     DEFINES['HAVE_SIDEBAR'] = True
 
diff --git a/dom/push/moz.build b/dom/push/moz.build
index b96099161..35683120f 100644
--- a/dom/push/moz.build
+++ b/dom/push/moz.build
@@ -16,7 +16,7 @@ EXTRA_JS_MODULES += [
     'PushService.jsm',
 ]
 
-if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
+if not CONFIG['MOZ_FENNEC']:
     # Everything but Fennec.
     EXTRA_JS_MODULES += [
         'PushServiceHttp2.jsm',
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index 5dc637799..8682aee97 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -773,7 +773,7 @@ if CONFIG['MOZ_BUILD_APP'] in ['xulrunner'] or CONFIG['MOZ_PHOENIX'] or CONFIG['
         'BrowserFeedWriter.webidl',
     ]
 
-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']:
     WEBIDL_FILES += [
         'External.webidl',
     ]
-- 
cgit v1.2.3