summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-21 06:58:22 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-21 06:58:22 +0000
commit45b7c5297c8ccf66230501e92e4a52679726d396 (patch)
tree4cef713db14e0f56c3e3a72f6d1df73fb97dbf00 /chrome_frame
parent6504c08e583886c60a2322b29c589c3ca6473215 (diff)
downloadchromium_src-45b7c5297c8ccf66230501e92e4a52679726d396.zip
chromium_src-45b7c5297c8ccf66230501e92e4a52679726d396.tar.gz
chromium_src-45b7c5297c8ccf66230501e92e4a52679726d396.tar.bz2
reland 'Set chrome_multiple_dll=1 by default on Windows in static_library'
Previously: https://codereview.chromium.org/22909017/ TBR=jam@chromium.org BUG=237249 Review URL: https://chromiumcodereview.appspot.com/23320004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index b495cc0..f9d13a5 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -412,7 +412,7 @@
'../chrome/chrome.gyp:renderer',
'../chrome/chrome.gyp:test_support_common',
'../chrome/chrome_resources.gyp:chrome_resources',
- '../content/content.gyp:content_app_browser',
+ '../content/content.gyp:content_app_both',
'../content/content.gyp:content_gpu',
'../content/content.gyp:test_support_content',
'../net/net.gyp:net',