Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6128)

Unified Diff: chrome/chrome_installer_util.gypi

Issue 8538016: Revert 109534 since this change broke clobbered component build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_installer_util.gypi
===================================================================
--- chrome/chrome_installer_util.gypi (revision 109652)
+++ chrome/chrome_installer_util.gypi (working copy)
@@ -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'],
- }],
- ],
}
],
}],
-
],
}
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698