diff options
| author | rchlodnicki@opera.com <rchlodnicki@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 01:25:15 +0000 |
|---|---|---|
| committer | rchlodnicki@opera.com <rchlodnicki@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 01:25:15 +0000 |
| commit | e1ed52ebfa73ca295ee6a34ee9ee2bfde1a49156 (patch) | |
| tree | 97b398572d5b336dd56ef7f8a13f905e8040744f /chrome/chrome_installer_util.gypi | |
| parent | d19d40d46917d7f347d1acd1517d162fb080755e (diff) | |
| download | chromium_src-e1ed52ebfa73ca295ee6a34ee9ee2bfde1a49156.zip chromium_src-e1ed52ebfa73ca295ee6a34ee9ee2bfde1a49156.tar.gz chromium_src-e1ed52ebfa73ca295ee6a34ee9ee2bfde1a49156.tar.bz2 | |
Don't pull in content_switches.cc to whole chrome code base
The point of this change is remove compilation of content_switches.cc
that was done in installer_util target. This is a static library
that other parts of chrome pull in and that makes the Chrome code that
references those switches compile even if the switches itself are
not exported.
Installer_util doesn't even seem to uses those switches AFAIK.
Dropped compilation of these files so these problems are actually
exposed and addressed by the person adding the switch. The main
offender that referenced those switches was chrome's about_flags.cc.
BUG=
Review URL: https://codereview.chromium.org/24994002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer_util.gypi')
| -rw-r--r-- | chrome/chrome_installer_util.gypi | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi index 1777308..31c3653 100644 --- a/chrome/chrome_installer_util.gypi +++ b/chrome/chrome_installer_util.gypi @@ -112,7 +112,6 @@ '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', '<(DEPTH)/chrome/common_constants.gyp:common_constants', - '<(DEPTH)/content/content.gyp:content_common', '<(DEPTH)/courgette/courgette.gyp:courgette_lib', '<(DEPTH)/crypto/crypto.gyp:crypto', '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch', @@ -161,14 +160,6 @@ 'installer/util/user_experiment.cc', 'installer/util/user_experiment.h', ], - 'conditions': [ - ['component=="shared_library"', { - 'sources': [ '../content/public/common/content_switches.cc' ], - 'defines': [ 'COMPILE_CONTENT_STATICALLY'], - }, { - 'dependencies': ['<(DEPTH)/content/content.gyp:content_common'], - }], - ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }, @@ -210,7 +201,6 @@ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', - '<(DEPTH)/chrome/common_constants.gyp:common_constants', ], 'sources': [ 'installer/util/google_update_experiment_util.cc', @@ -223,12 +213,6 @@ 'include_dirs': [ '<(DEPTH)', ], - 'conditions': [ - ['component == "shared_library"', { - 'sources': [ '../content/public/common/content_switches.cc' ], - 'defines': [ 'COMPILE_CONTENT_STATICALLY'], - }], - ], } ], }], |