Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1205)

Unified Diff: build/all.gyp

Issue 8202014: Fixes aura build on windows. Makes all tests use the test compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index f1842d19661f41d20e0087e9abbfdaac539402cf..4671f6579666a3ff38a83e03550e71c0a6d06dd9 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"
« no previous file with comments | « no previous file | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698