Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1358790 - compile city.cpp in toolkit/xre/ so it doesn't depend on browser/; r=mhowell

Browse Source 
Bug 1324617 added /other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp
to the sources for browser/components/shell/, which gets linked into libxul
via browsercomps.

Bug 1348609 then made toolkit/xre/nsXREDirProvider.cpp use the same file,
which made toolkit depend on browser.  That busts other XUL apps, which then
have to individually satisfy that dependency.

This change links city.cpp into libxul directly by compiling it as part of
toolkit/xre/.
This commit is contained in:
Myk Melez 2017-04-20 18:10:28 -07:00
parent fa7e506fa5
commit 07f5d65c45
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/components/shell/moz.build
View File

@ -30,7 +30,6 @@ XPIDL_MODULE = 'shellservice'
if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
'../../../other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp',
'nsWindowsShellService.cpp',
]
LOCAL_INCLUDES += [

3
toolkit/xre/moz.build
View File

@ -35,6 +35,9 @@ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
EXPORTS += ['EventTracer.h']
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
SOURCES += [
'../../other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp',
]
UNIFIED_SOURCES += [
'nsNativeAppSupportWin.cpp',
]