diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 02:12:04 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 02:12:04 +0000 |
| commit | 573e3ff020361d91d17add91e90920d4a4e8035c (patch) | |
| tree | d4b3cc7eee2cd2f8764404019c08472d5b48a5d9 /build/all.gyp | |
| parent | 9fd6cedb5c3856cb7c4e5a0cfa7f34f71df7feb3 (diff) | |
| download | chromium_src-573e3ff020361d91d17add91e90920d4a4e8035c.zip chromium_src-573e3ff020361d91d17add91e90920d4a4e8035c.tar.gz chromium_src-573e3ff020361d91d17add91e90920d4a4e8035c.tar.bz2 | |
Revert "Remove gyp target of the candidate_window binary."
This reverts commit 72c57bf7dd6cb21708ba0b18a59d6b23196f65f4.
BUG=chromium-os:11381
TEST=None
TBR=satorux
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index 499a4ec..3ea4654 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -125,6 +125,11 @@ '../views/views.gyp:*', ], }], + ['chromeos==1', { + 'dependencies': [ + '../chrome/browser/chromeos/input_method/candidate_window.gyp:*', + ], + }], ['remoting==1', { 'dependencies': [ '../remoting/remoting.gyp:*', @@ -462,6 +467,7 @@ 'dependencies': [ '../app/app.gyp:app_unittests', '../base/base.gyp:base_unittests', + '../chrome/browser/chromeos/input_method/candidate_window.gyp:candidate_window', '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:chrome', '../chrome/chrome.gyp:interactive_ui_tests', |