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 /views/views.gyp | |
| 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 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/views.gyp b/views/views.gyp index c2d1811..ec8352b 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -64,11 +64,11 @@ 'msvs_guid': '6F9258E5-294F-47B2-919D-17FFE7A8B751', 'dependencies': [ '../app/app.gyp:app_base', - '../app/app.gyp:app_strings', '../app/app.gyp:app_resources', '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../ui/base/strings/ui_strings.gyp:ui_strings', ], 'sources': [ # All .cc, .h under views, except unittests @@ -460,7 +460,6 @@ 'type': 'executable', 'dependencies': [ '../app/app.gyp:app_resources', - '../app/app.gyp:app_strings', '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', @@ -468,6 +467,7 @@ '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../ui/base/strings/ui_strings.gyp:ui_strings', 'views', ], 'include_dirs': [ |