summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 03:13:04 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 03:13:04 +0000
commit3f2630669063756d43eb2b2b7c1c747dc35942f3 (patch)
tree2bae7ac1d8e1adc0083a85f7b1b37b3b01deaaaa
parent241e3a43f2dc6227bfaebbc5bc2d9685e47ae00f (diff)
downloadchromium_src-3f2630669063756d43eb2b2b7c1c747dc35942f3.zip
chromium_src-3f2630669063756d43eb2b2b7c1c747dc35942f3.tar.gz
chromium_src-3f2630669063756d43eb2b2b7c1c747dc35942f3.tar.bz2
Move comctl32.lib dep from content_unittests to content_browser.
browser_main.cc uses InitCommonControlsEx(). BUG=none TEST=none Review URL: http://codereview.chromium.org/8220025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104841 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/content_browser.gypi1
-rw-r--r--content/content_tests.gypi5
2 files changed, 1 insertions, 5 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index f7dc5b6..2aabdae 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -560,6 +560,7 @@
],
'link_settings': {
'libraries': [
+ '-lcomctl32.lib',
'-llocationapi.lib',
'-lsensorsapi.lib',
],
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 6c3ffe8..3dd46d5 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -249,11 +249,6 @@
],
'conditions': [
['OS=="win"', {
- 'link_settings': {
- 'libraries': [
- '-lcomctl32.lib',
- ],
- },
'resource_include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/webkit',
],