diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-21 22:47:04 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-21 22:47:04 +0000 |
| commit | a93f058d6a6a4ea6b6a214cc0c9cda40f9b9dc11 (patch) | |
| tree | e90b2a35b09d32eba123f1f84451142427d9ec0b /views/views.gyp | |
| parent | 074f105692a4783df43d1d1a68bb866a51e5b66b (diff) | |
| download | chromium_src-a93f058d6a6a4ea6b6a214cc0c9cda40f9b9dc11.zip chromium_src-a93f058d6a6a4ea6b6a214cc0c9cda40f9b9dc11.tar.gz chromium_src-a93f058d6a6a4ea6b6a214cc0c9cda40f9b9dc11.tar.bz2 | |
Parts of my previous changelist didn't make it through.
http://crbug.com/11387
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/views/views.gyp b/views/views.gyp index 2165a52..dff1b66 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -44,6 +44,7 @@ 'dependencies': [ '../app/app.gyp:app_base', '../app/app.gyp:app_strings', + '../app/app.gyp:app_resources', '../skia/skia.gyp:skia', '../third_party/icu38/icu38.gyp:icui18n', '../third_party/icu38/icu38.gyp:icuuc', @@ -214,6 +215,9 @@ ], 'conditions': [ ['OS=="linux"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], 'sources!': [ 'accelerator.cc', 'accessibility/accessible_wrapper.cc', @@ -257,14 +261,6 @@ 'window/native_frame_view.cc', 'widget/widget_win.cc', ], - # TODO: Move these dependencies to platform-neutral once these - # projects are generated by GYP. - 'dependencies': [ - '../chrome/chrome.gyp:chrome_resources', - '../chrome/chrome.gyp:chrome_strings', - '../chrome/chrome.gyp:theme_resources', - '../build/linux/system.gyp:gtk', - ], }], ['OS=="win"', { 'defines': [ @@ -276,13 +272,6 @@ # TODO(beng): move wtl to src/third_party '../chrome/third_party/wtl/include', ], - # TODO: remove this when chrome_resources/chrome_strings are - # generated by GYP. - # The legacy vcproj we rely on places the grit output in this - # directory, so we need to explicitly add it to our include path. - 'include_dirs': [ - '<(PRODUCT_DIR)/grit_derived_sources', - ], }], ], }, |