diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 21:23:56 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 21:23:56 +0000 |
| commit | 9187d22dee40a8ed4f98ae6fae510e18ebe1c4d8 (patch) | |
| tree | 07f57f95e3f0fe102ea030d724ad13a4289c93dc /build | |
| parent | af11c4aa1717b2b7cc23cad104ef18429c7bf496 (diff) | |
| download | chromium_src-9187d22dee40a8ed4f98ae6fae510e18ebe1c4d8.zip chromium_src-9187d22dee40a8ed4f98ae6fae510e18ebe1c4d8.tar.gz chromium_src-9187d22dee40a8ed4f98ae6fae510e18ebe1c4d8.tar.bz2 | |
Fixes aura build on windows. Makes all tests use the test compositor
as the bots don't have the right libraries yet.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8202014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index f1842d1..4671f65 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -615,6 +615,21 @@ '../views/views.gyp:views_unittests', '../webkit/webkit.gyp:pull_in_webkit_unit_tests', ], + 'conditions': [ + ['OS=="win"', { + # Remove this when we have the real compositor. + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': ['../third_party/directxsdk/files/dlls/D3DX10d_43.dll'] + }, + ], + 'dependencies': [ + '../chrome/chrome.gyp:crash_service', + '../chrome/chrome.gyp:crash_service_win64', + ], + }], + ], }, ], # targets }], # "use_aura==1" |