Bug 1520139: Make sure nsXREDirProvider can find commonupdatedir.h regardless of whether the updater is enabled. r=froydnj
authorDave Townsend <dtownsend@oxymoronical.com>
Tue, 15 Jan 2019 18:29:22 +0000
changeset 513943 81873890e8b7d43fa291b54fe506f9b1e4fb4ee2
parent 513942 c7f31b684841a1302d98bbe0e45415d15668bd6f
child 513944 1ea9c437d417f92a25221ad77be2f142ec98833e
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1520139
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1520139: Make sure nsXREDirProvider can find commonupdatedir.h regardless of whether the updater is enabled. r=froydnj When the updater is disabled toolkit/mozapps/update/common is not traversed as part of the build. But toolkit/mozapps/update/common/commonupdatedir.cpp is included in the toolkit/xre build regardless and GetInstallHash is used. This makes nsXREDirProvider.cpp able to find the header that defines it. Differential Revision: https://phabricator.services.mozilla.com/D16582
toolkit/xre/moz.build
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -185,16 +185,17 @@ for var in ('APP_VERSION', 'APP_ID'):
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
 
 LOCAL_INCLUDES += [
     '../../other-licenses/nsis/Contrib/CityHash/cityhash',
     '../components/find',
     '../components/printingui/ipc',
     '../components/windowwatcher',
+    '../mozapps/update/common',
     '../profile',
     '/config',
     '/dom/base',
     '/dom/commandhandler',
     '/dom/ipc',
     '/dom/webbrowserpersist',
     '/testing/gtest/mozilla',
     '/toolkit/crashreporter',