diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-21 03:08:16 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-21 03:08:16 +0000 |
| commit | 5a2b9c10a72928624288f61237e684009da2d683 (patch) | |
| tree | 51165ed799330436f64836402010cb778c144919 /views/views.gyp | |
| parent | d6723cab1c954fd06207aaba54b349a3e854a738 (diff) | |
| download | chromium_src-5a2b9c10a72928624288f61237e684009da2d683.zip chromium_src-5a2b9c10a72928624288f61237e684009da2d683.tar.gz chromium_src-5a2b9c10a72928624288f61237e684009da2d683.tar.bz2 | |
Revert 16567.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/views/views.gyp b/views/views.gyp index dff1b66..d65a102 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -44,7 +44,6 @@ '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', @@ -261,6 +260,13 @@ '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', + ], }], ['OS=="win"', { 'defines': [ @@ -272,6 +278,13 @@ # 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', + ], }], ], }, |