diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-24 06:41:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 06:41:20 +0200 |
| commit | f71c04d814416ebf52dd54109f2d04f1cbd397c0 (patch) | |
| tree | 578f23631e84aff1c50bb9c5c5e7999475fad607 /toolkit/components/startup | |
| parent | d07a4f2ba9295068681ecfb8e36418f6b72c3d56 (diff) | |
| parent | afe69140a8485b271d8f6ac1d7551540cea11c66 (diff) | |
| download | UXP-f71c04d814416ebf52dd54109f2d04f1cbd397c0.tar UXP-f71c04d814416ebf52dd54109f2d04f1cbd397c0.tar.gz UXP-f71c04d814416ebf52dd54109f2d04f1cbd397c0.tar.lz UXP-f71c04d814416ebf52dd54109f2d04f1cbd397c0.tar.xz UXP-f71c04d814416ebf52dd54109f2d04f1cbd397c0.zip | |
Merge pull request #851 from MoonchildProductions/revert-796-nsuserinfo
Revert "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, 17 insertions, 12 deletions
diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build index 5f290b783..dbd580384 100644 --- a/toolkit/components/startup/moz.build +++ b/toolkit/components/startup/moz.build @@ -18,14 +18,19 @@ UNIFIED_SOURCES += [ 'StartupTimeline.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'] +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 948a7d7ee..5894b6c51 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'] - -if CONFIG['MOZ_USERINFO']: - XPIDL_SOURCES += ['nsIUserInfo.idl'] +XPIDL_SOURCES += [ + 'nsIAppStartup.idl', + 'nsIUserInfo.idl', +] XPIDL_MODULE = 'appstartup' |