Bug 1359364 - Port Bug 1358790 to C-C: compile city.cpp in toolkit/xre/ so it doesn't depend on mail. rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Tue, 25 Apr 2017 12:58:25 +0200
changeset 21474 c2f926700d44bf7679afd85e9ba483f76de55259
parent 21473 819f6281ca932a8aa27efae50aa7546f692f5cf7
child 21475 6839a3336715fec96d5d449be6eeccdc95eb8519
push id13070
push usermozilla@jorgk.com
push dateTue, 25 Apr 2017 11:01:01 +0000
treeherdercomm-central@c2f926700d44 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1359364, 1358790
Bug 1359364 - Port Bug 1358790 to C-C: compile city.cpp in toolkit/xre/ so it doesn't depend on mail. rs=bustage-fix
mail/components/shell/moz.build
--- a/mail/components/shell/moz.build
+++ b/mail/components/shell/moz.build
@@ -8,17 +8,16 @@ DIRS += ['public']
 SOURCES += [
     'DirectoryProvider.cpp',
 ]
 
 DEFINES['MOZ_APP_NAME'] = '"%s"' % CONFIG['MOZ_APP_NAME']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
-        '../../../mozilla/other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp',
         'nsMailWinIntegration.cpp',
     ]
     LOCAL_INCLUDES += [
         '../../../mozilla/other-licenses/nsis/Contrib/CityHash/cityhash',
     ]
 
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     SOURCES += ['nsMailGNOMEIntegration.cpp']