diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-06 09:16:53 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-06 09:16:53 +0000 |
| commit | 934f80d96924ae168977371475e7ebf206a5674f (patch) | |
| tree | cc53bddcbe8aa2dd9f14d5175279c3a1c83863ce /app/app_base.gypi | |
| parent | a7e4016e7eb30d8056e1e65e2888de36a15a0f4f (diff) | |
| download | chromium_src-934f80d96924ae168977371475e7ebf206a5674f.zip chromium_src-934f80d96924ae168977371475e7ebf206a5674f.tar.gz chromium_src-934f80d96924ae168977371475e7ebf206a5674f.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.
Review URL: http://codereview.chromium.org/6541035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/app_base.gypi')
| -rw-r--r-- | app/app_base.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index 163045f..1cf9f34 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -59,10 +59,9 @@ '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 +72,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 +420,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, |