summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_host_win.gypi
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2015-07-21 10:00:47 -0700
committerNico Weber <thakis@chromium.org>2015-07-21 17:02:40 +0000
commit13e350d3f0ff78bd0e6b96c83ffbd428d695acac (patch)
tree8b6575693f177f6e8ebc33054f2de8ea10564bbf /remoting/remoting_host_win.gypi
parent92f94f2028d3c226577930cb6df777f7f5edbbed (diff)
downloadchromium_src-13e350d3f0ff78bd0e6b96c83ffbd428d695acac.zip
chromium_src-13e350d3f0ff78bd0e6b96c83ffbd428d695acac.tar.gz
chromium_src-13e350d3f0ff78bd0e6b96c83ffbd428d695acac.tar.bz2
Revert "Preliminary support for Windows manifests in the GN build."
This reverts https://codereview.chromium.org/1240893004/ , it broke building remoting in the gyp build (see comment on the review). TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/1249723002. Cr-Commit-Position: refs/heads/master@{#339669}
Diffstat (limited to 'remoting/remoting_host_win.gypi')
-rw-r--r--remoting/remoting_host_win.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/remoting_host_win.gypi b/remoting/remoting_host_win.gypi
index 2374041..9c0b3e9 100644
--- a/remoting/remoting_host_win.gypi
+++ b/remoting/remoting_host_win.gypi
@@ -240,7 +240,7 @@
'VCManifestTool': {
'EmbedManifest': 'true',
'AdditionalManifestFiles': [
- '<(DEPTH)/build/win/common_controls.manifest',
+ 'host/win/common-controls.manifest',
],
},
'VCLinkerTool': {