diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-03 09:06:25 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-03 09:06:25 +0100 |
| commit | 1626b5d7041ea9c3db92200f91542da46e49dde6 (patch) | |
| tree | e99c393052ef818645027da57774672990e29514 /toolkit/components/startup | |
| parent | 314fb761d144b160d3aeb72840c89e31c4f21a4a (diff) | |
| parent | 1d55939c7ca0e80555a24b240ff68d5bdbb48b4a (diff) | |
| download | UXP-1626b5d7041ea9c3db92200f91542da46e49dde6.tar UXP-1626b5d7041ea9c3db92200f91542da46e49dde6.tar.gz UXP-1626b5d7041ea9c3db92200f91542da46e49dde6.tar.lz UXP-1626b5d7041ea9c3db92200f91542da46e49dde6.tar.xz UXP-1626b5d7041ea9c3db92200f91542da46e49dde6.zip | |
Merge branch 'master' into Basilisk-releasev2018.11.04
Diffstat (limited to 'toolkit/components/startup')
| -rw-r--r-- | toolkit/components/startup/moz.build | 21 | ||||
| -rw-r--r-- | toolkit/components/startup/public/moz.build | 8 |
2 files changed, 12 insertions, 17 deletions
diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build index dbd580384..5f290b783 100644 --- a/toolkit/components/startup/moz.build +++ b/toolkit/components/startup/moz.build @@ -18,19 +18,14 @@ UNIFIED_SOURCES += [ 'StartupTimeline.cpp', ] -if CONFIG['OS_ARCH'] == 'WINNT': - # This file cannot be built in unified mode because of name clashes with Windows headers. - SOURCES += [ - 'nsUserInfoWin.cpp', - ] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - UNIFIED_SOURCES += [ - 'nsUserInfoMac.mm', - ] -else: - UNIFIED_SOURCES += [ - 'nsUserInfoUnix.cpp', - ] +if CONFIG['MOZ_USERINFO']: + if CONFIG['OS_ARCH'] == 'WINNT': + # This file cannot be built in unified mode because of name clashes with Windows headers. + SOURCES += ['nsUserInfoWin.cpp'] + elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + UNIFIED_SOURCES += ['nsUserInfoMac.mm'] + else: + UNIFIED_SOURCES += ['nsUserInfoUnix.cpp'] FINAL_LIBRARY = 'xul' diff --git a/toolkit/components/startup/public/moz.build b/toolkit/components/startup/public/moz.build index 5894b6c51..948a7d7ee 100644 --- a/toolkit/components/startup/public/moz.build +++ b/toolkit/components/startup/public/moz.build @@ -4,10 +4,10 @@ # 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/. -XPIDL_SOURCES += [ - 'nsIAppStartup.idl', - 'nsIUserInfo.idl', -] +XPIDL_SOURCES += ['nsIAppStartup.idl'] + +if CONFIG['MOZ_USERINFO']: + XPIDL_SOURCES += ['nsIUserInfo.idl'] XPIDL_MODULE = 'appstartup' |