diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-03 08:22:52 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-03 08:22:52 -0500 |
| commit | 7239cc8c7e9c140be6858c659d942f6d71283531 (patch) | |
| tree | a253fdf254e4c0cb87c0fcf69c8b3b5761f31530 /toolkit/components | |
| parent | 6ff7b85d14eeb64216e7cba5d76beeb2c485045e (diff) | |
| download | UXP-7239cc8c7e9c140be6858c659d942f6d71283531.tar UXP-7239cc8c7e9c140be6858c659d942f6d71283531.tar.gz UXP-7239cc8c7e9c140be6858c659d942f6d71283531.tar.lz UXP-7239cc8c7e9c140be6858c659d942f6d71283531.tar.xz UXP-7239cc8c7e9c140be6858c659d942f6d71283531.zip | |
Use MOZ_PHOENIX instead of checking for 'browser' in MOZ_BUILD_APP
Diffstat (limited to 'toolkit/components')
| -rw-r--r-- | toolkit/components/passwordmgr/moz.build | 4 | ||||
| -rw-r--r-- | toolkit/components/search/moz.build | 2 | ||||
| -rw-r--r-- | toolkit/components/telemetry/TelemetryEnvironment.jsm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build index 72c8c70a4..e54e6ba2d 100644 --- a/toolkit/components/passwordmgr/moz.build +++ b/toolkit/components/passwordmgr/moz.build @@ -4,7 +4,7 @@ # 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'] == 'browser': +if CONFIG['MOZ_PHOENIX']: DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True MOCHITEST_MANIFESTS += ['test/mochitest.ini', 'test/mochitest/mochitest.ini'] @@ -67,7 +67,7 @@ if CONFIG['OS_TARGET'] == 'WINNT': 'OSCrypto_win.js', ] -if CONFIG['MOZ_BUILD_APP'] == 'browser': +if CONFIG['MOZ_PHOENIX']: EXTRA_JS_MODULES += [ 'LoginManagerContextMenu.jsm', ] diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build index 98ccf2b8d..2dc142882 100644 --- a/toolkit/components/search/moz.build +++ b/toolkit/components/search/moz.build @@ -11,7 +11,7 @@ EXTRA_COMPONENTS += [ 'nsSearchSuggestions.js', ] -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
EXTRA_COMPONENTS += [ 'nsSidebar.js', diff --git a/toolkit/components/telemetry/TelemetryEnvironment.jsm b/toolkit/components/telemetry/TelemetryEnvironment.jsm index e2453649c..2f4ac81ba 100644 --- a/toolkit/components/telemetry/TelemetryEnvironment.jsm +++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm @@ -784,7 +784,7 @@ function EnvironmentCache() { this._currentEnvironment.profile = {}; p.push(this._updateProfile()); - if (AppConstants.MOZ_BUILD_APP == "browser") { + if (AppConstants.MOZ_PHOENIX) { p.push(this._updateAttribution()); } |