diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 20:57:49 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 20:57:49 +0000 |
| commit | 99245a080cb0558a1642b4416f9e44f24bba3b3c (patch) | |
| tree | bd5833a0c799281bb4b2728957ab1bfa4e922be0 /chrome/chrome_installer_util.gypi | |
| parent | 8a21822aef69e2f420053a30c35835ba6d794b03 (diff) | |
| download | chromium_src-99245a080cb0558a1642b4416f9e44f24bba3b3c.zip chromium_src-99245a080cb0558a1642b4416f9e44f24bba3b3c.tar.gz chromium_src-99245a080cb0558a1642b4416f9e44f24bba3b3c.tar.bz2 | |
Move common_constants target into a proper .gyp file so that it can shared
more easily by multiple projects (e.g., chrome & unittests).
This is needed because:
* Including the gypi directly from each .gyp that needs it will break ninja
(since it merges all the gyps into a single file).
* Referring to chrome.gyp:common_constants breaks the circular dependency
check on the Mac.
BUG=none
TEST=gclient runhooks, make chrome, ninja chrome
Review URL: https://chromiumcodereview.appspot.com/9112019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer_util.gypi')
| -rw-r--r-- | chrome/chrome_installer_util.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi index 45ffd9e..3486131 100644 --- a/chrome/chrome_installer_util.gypi +++ b/chrome/chrome_installer_util.gypi @@ -105,12 +105,12 @@ }, 'dependencies': [ 'installer_util_strings', - 'common_constants', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', '<(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', @@ -194,9 +194,9 @@ 'target_name': 'installer_util', 'type': 'static_library', 'dependencies': [ - 'common_constants', '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', + '<(DEPTH)/chrome/common_constants.gyp:common_constants', ], 'sources': [ 'installer/util/master_preferences.cc', |