| Index: chrome/chrome_installer_util.gypi
|
| diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi
|
| index 1777308a0cd964fdc407a58b10f383f72f5d30b2..31c3653a9e2205097fbcfdb6624042efbd401fbf 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'],
|
| - }],
|
| - ],
|
| }
|
| ],
|
| }],
|
|
|