summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_installer_util.gypi
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 05:55:58 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 05:55:58 +0000
commit0c32bac85f886491e61c3d7f031fa78a50e03729 (patch)
treec06f5c7172a98929092c9564b616e39b1410441f /chrome/chrome_installer_util.gypi
parent8a810d9876bff1cee4f67b48efb406a8fafdd21a (diff)
downloadchromium_src-0c32bac85f886491e61c3d7f031fa78a50e03729.zip
chromium_src-0c32bac85f886491e61c3d7f031fa78a50e03729.tar.gz
chromium_src-0c32bac85f886491e61c3d7f031fa78a50e03729.tar.bz2
Revert 108976 (broke win shared) - enable component build for content
R=jam@chromium.org BUG=90442 TEST= Review URL: http://codereview.chromium.org/8343068 TBR=dpranke@chromium.org Review URL: http://codereview.chromium.org/8496006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer_util.gypi')
-rw-r--r--chrome/chrome_installer_util.gypi19
1 files changed, 2 insertions, 17 deletions
diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi
index fdb17d66..f6bbe07 100644
--- a/chrome/chrome_installer_util.gypi
+++ b/chrome/chrome_installer_util.gypi
@@ -97,13 +97,13 @@
},
'dependencies': [
'installer_util_strings',
+ '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'common_constants',
'chrome_resources.gyp:chrome_resources',
'chrome_resources.gyp:chrome_strings',
+ '../content/content.gyp:content_common',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
- '<(DEPTH)/content/content.gyp:content_common',
'<(DEPTH)/courgette/courgette.gyp:courgette_lib',
'<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch',
'<(DEPTH)/third_party/icu/icu.gyp:icui18n',
@@ -141,14 +141,6 @@
'installer/util/shell_util.cc',
'installer/util/shell_util.h',
],
- 'conditions': [
- ['component == "shared_library"', {
- 'sources': [ '../content/public/common/content_switches.cc' ],
- 'defines': [ 'COMPILE_CONTENT_STATICALLY'],
- }, {
- 'dependencies': ['<(DEPTH)/content/content.gyp:content_common'],
- }],
- ],
},
{
'target_name': 'installer_util_nacl_win64',
@@ -194,15 +186,8 @@
'include_dirs': [
'<(DEPTH)',
],
- 'conditions': [
- ['component == "shared_library"', {
- 'sources': [ '../content/public/common/content_switches.cc' ],
- 'defines': [ 'COMPILE_CONTENT_STATICALLY'],
- }],
- ],
}
],
}],
-
],
}