diff options
| author | grt <grt@chromium.org> | 2015-05-27 14:42:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-27 21:43:22 +0000 |
| commit | 235b3f097ca97e158b2fb6f7161c5e12c38fb5ed (patch) | |
| tree | dffaa1447b1b277623c080ed7e979a8210dbf0a9 /win8 | |
| parent | c1be51164d32964c5626e37ed36808b53285ee98 (diff) | |
| download | chromium_src-235b3f097ca97e158b2fb6f7161c5e12c38fb5ed.zip chromium_src-235b3f097ca97e158b2fb6f7161c5e12c38fb5ed.tar.gz chromium_src-235b3f097ca97e158b2fb6f7161c5e12c38fb5ed.tar.bz2 | |
No longer build/use google_update on non-Chrome builds.
Google Update integration is not supported on Chromium builds.
Also entirely remove the dependency on google_update from
remoting/host/setup and win8/metro_driver, neither of which
used it.
BUG=none
Review URL: https://codereview.chromium.org/1136473005
Cr-Commit-Position: refs/heads/master@{#331659}
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/delegate_execute/chrome_util.cc | 3 | ||||
| -rw-r--r-- | win8/delegate_execute/delegate_execute.gyp | 5 | ||||
| -rw-r--r-- | win8/metro_driver/metro_driver.gyp | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/win8/delegate_execute/chrome_util.cc b/win8/delegate_execute/chrome_util.cc index 489e9fb..858a2ca 100644 --- a/win8/delegate_execute/chrome_util.cc +++ b/win8/delegate_execute/chrome_util.cc @@ -27,7 +27,10 @@ #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/util_constants.h" + +#if defined(GOOGLE_CHROME_BUILD) #include "google_update/google_update_idl.h" +#endif namespace { diff --git a/win8/delegate_execute/delegate_execute.gyp b/win8/delegate_execute/delegate_execute.gyp index 0138cb4..7247e08 100644 --- a/win8/delegate_execute/delegate_execute.gyp +++ b/win8/delegate_execute/delegate_execute.gyp @@ -77,6 +77,11 @@ '../win8.gyp:metro_viewer_constants', ], }], + ['branding!="Chrome"', { + 'dependencies!': [ + '../../google_update/google_update.gyp:google_update', + ], + }], ], }, { diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp index 1a815e4..2720bb5 100644 --- a/win8/metro_driver/metro_driver.gyp +++ b/win8/metro_driver/metro_driver.gyp @@ -51,7 +51,6 @@ '../../chrome/common_constants.gyp:common_constants', '../../chrome/chrome.gyp:installer_util', '../../crypto/crypto.gyp:crypto', - '../../google_update/google_update.gyp:google_update', '../../ipc/ipc.gyp:ipc', '../../sandbox/sandbox.gyp:sandbox', '../../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages', |