summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_dll.gypi
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 20:09:10 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 20:09:10 +0000
commitcc9a9a88d5da672b09285ead7e604b6d7b77fd3d (patch)
tree9e347b635139c3a20253e27c395dd93157750ddb /chrome/chrome_dll.gypi
parent10a749306e5212cc96a32fe9006c2a8d04606736 (diff)
downloadchromium_src-cc9a9a88d5da672b09285ead7e604b6d7b77fd3d.zip
chromium_src-cc9a9a88d5da672b09285ead7e604b6d7b77fd3d.tar.gz
chromium_src-cc9a9a88d5da672b09285ead7e604b6d7b77fd3d.tar.bz2
Move content specific switches to content, in preparation for moving directories that currently depend on common (like gpu).
TBR=bradnelson Review URL: http://codereview.chromium.org/6603011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
-rw-r--r--chrome/chrome_dll.gypi8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 7775876..194ece1 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -604,6 +604,14 @@
# Stub entry points for process types that are not supported
# by NaCl Win64 executable
'app/dummy_main_functions.cc',
+
+ # TODO(bradnelson): once automatic generation of 64 bit targets on
+ # Windows is ready, take this out and add a dependency on
+ # content_common.gypi and common.gypi in nacl_win64_dependencies
+ # and get rid of the common_constants.gypi which was added as a hack
+ # to avoid making common compile on 64 bit on Windows.
+ '../content/common/content_switches.cc',
+ '../content/common/content_switches.h',
],
'msvs_settings': {
'VCLinkerTool': {