diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 18:24:56 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 18:24:56 +0000 |
| commit | c014a08e687ea5549653ee50ac2ca67023c15ab2 (patch) | |
| tree | 576d6aa8c7ccca4ccca3ce35b06868f5495f2fe3 /chrome/chrome_installer_util.gypi | |
| parent | 0711b5d9593e46b3ef0b8d0706418cb74f41e1f3 (diff) | |
| download | chromium_src-c014a08e687ea5549653ee50ac2ca67023c15ab2.zip chromium_src-c014a08e687ea5549653ee50ac2ca67023c15ab2.tar.gz chromium_src-c014a08e687ea5549653ee50ac2ca67023c15ab2.tar.bz2 | |
Revert 109534 since this change broke clobbered component build.
Original CL:
reenable component build w/ fix to test_support_content
TBR=jam@chromium.org
BUG=90442
TEST=the win shared debug builder compiles
Review URL: http://codereview.chromium.org/8501025
TBR=dpranke@chromium.org
Review URL: http://codereview.chromium.org/8538016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer_util.gypi')
| -rw-r--r-- | chrome/chrome_installer_util.gypi | 19 |
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'], - }], - ], } ], }], - ], } |