From 7239cc8c7e9c140be6858c659d942f6d71283531 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 3 Feb 2018 08:22:52 -0500 Subject: Use MOZ_PHOENIX instead of checking for 'browser' in MOZ_BUILD_APP --- dom/base/moz.build | 2 +- dom/bindings/moz.build | 2 +- dom/webidl/moz.build | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'dom') diff --git a/dom/base/moz.build b/dom/base/moz.build index d237acb03..0bc9902e4 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -472,7 +472,7 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' -if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: +if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']: DEFINES['HAVE_SIDEBAR'] = True if CONFIG['MOZ_X11']: diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index fadaac69b..eb00482c6 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 ['browser', 'mobile/android', 'xulrunner']: +if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']: # This is needed for Window.webidl DEFINES['HAVE_SIDEBAR'] = True diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index efa90230d..0b415d448 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -764,12 +764,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': 'MozWifiStatusChangeEvent.webidl', ] -if CONFIG['MOZ_BUILD_APP'] in ['browser', 'xulrunner'] or CONFIG['MOZ_SUITE']: +if CONFIG['MOZ_BUILD_APP'] in ['xulrunner'] or CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_SUITE']: WEBIDL_FILES += [ 'BrowserFeedWriter.webidl', ] -if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: +if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']: WEBIDL_FILES += [ 'External.webidl', ] -- cgit v1.2.3