diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 21:27:21 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 21:27:21 +0000 |
| commit | 8cfb591192035c18087296d931880149b2bf63a6 (patch) | |
| tree | a8c8f922b35ebfd8e32aa5fd83fd5a802a13aea7 /app/app_base.gypi | |
| parent | 6c37af55bd6636da96748d4ebc51ad6a691d6435 (diff) | |
| download | chromium_src-8cfb591192035c18087296d931880149b2bf63a6.zip chromium_src-8cfb591192035c18087296d931880149b2bf63a6.tar.gz chromium_src-8cfb591192035c18087296d931880149b2bf63a6.tar.bz2 | |
Carnitas: Move app_strings to ui/base/strings
To fix circular dependencies between ui/base/ui_base.gyp and app/app.gyp I'm moving app_strings to ui/base/strings.
BUG=72317
TEST=Compiled on Mac, Linux, Windows.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/app_base.gypi')
| -rw-r--r-- | app/app_base.gypi | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index 163045f..9e98ce4 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -59,10 +59,8 @@ 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/app', }, 'dependencies': [ - # app resources and app_strings should be shared with the 64-bit + # app resources and ui_strings should be shared with the 64-bit # target, but it doesn't work due to a bug in gyp - 'app_resources', - 'app_strings', '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../ui/gfx/gfx.gyp:gfx', @@ -73,6 +71,7 @@ '../third_party/libpng/libpng.gyp:libpng', '../third_party/sqlite/sqlite.gyp:sqlite', '../third_party/zlib/zlib.gyp:zlib', + '../ui/base/strings/ui_strings.gyp:ui_strings', '<(libjpeg_gyp_path):libjpeg', ], 'include_dirs': [ @@ -420,11 +419,11 @@ 'type': '<(library)', 'msvs_guid': '4987C6F9-B230-48E5-BF91-418EAE69AD90', 'dependencies': [ - # app resources and app_strings should be shared with the 32-bit + # app resources and ui_strings should be shared with the 32-bit # target, but it doesn't work due to a bug in gyp 'app_resources', - 'app_strings', '../base/base.gyp:base_nacl_win64', + '../ui/base/strings/ui_strings.gyp:ui_strings', ], 'variables': { 'app_base_target': 1, |