diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-24 06:02:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 06:02:10 +0200 |
| commit | f85840a0530d3524e1a3ae82dcf38b99ee0724c7 (patch) | |
| tree | 0aae1cf6e6038bcfbc89df46c9ca193a1a20ae01 /toolkit/components/startup | |
| parent | d1a35c3fa6a59f622becc328bf00eff98732dc53 (diff) | |
| parent | 19b6f2d9b71ca5f355dbf416ff599370c8ca0eb4 (diff) | |
| download | UXP-f85840a0530d3524e1a3ae82dcf38b99ee0724c7.tar UXP-f85840a0530d3524e1a3ae82dcf38b99ee0724c7.tar.gz UXP-f85840a0530d3524e1a3ae82dcf38b99ee0724c7.tar.lz UXP-f85840a0530d3524e1a3ae82dcf38b99ee0724c7.tar.xz UXP-f85840a0530d3524e1a3ae82dcf38b99ee0724c7.zip | |
Merge pull request #796 from g4jc/nsuserinfo
Make nsIUserInfo component optional with --disable-userinfo at build time
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' |