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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/aura/aura.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'All', 8 'target_name': 'All',
9 'type': 'none', 9 'type': 'none',
10 'xcode_create_dependents_test_runner': 1, 10 'xcode_create_dependents_test_runner': 1,
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 '../ui/aura_shell/aura_shell.gyp:aura_shell_exe', 608 '../ui/aura_shell/aura_shell.gyp:aura_shell_exe',
609 '../ui/aura/aura.gyp:*', 609 '../ui/aura/aura.gyp:*',
610 '../ui/gfx/compositor/compositor.gyp:*', 610 '../ui/gfx/compositor/compositor.gyp:*',
611 '../views/views.gyp:views', 611 '../views/views.gyp:views',
612 '../views/views.gyp:views_aura_desktop', 612 '../views/views.gyp:views_aura_desktop',
613 '../views/views.gyp:views_desktop', 613 '../views/views.gyp:views_desktop',
614 '../views/views.gyp:views_desktop_lib', 614 '../views/views.gyp:views_desktop_lib',
615 '../views/views.gyp:views_unittests', 615 '../views/views.gyp:views_unittests',
616 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', 616 '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
617 ], 617 ],
618 'conditions': [
619 ['OS=="win"', {
620 # Remove this when we have the real compositor.
621 'copies': [
622 {
623 'destination': '<(PRODUCT_DIR)',
624 'files': ['../third_party/directxsdk/files/dlls/D3DX10d_43.dll ']
625 },
626 ],
627 'dependencies': [
628 '../chrome/chrome.gyp:crash_service',
629 '../chrome/chrome.gyp:crash_service_win64',
630 ],
631 }],
632 ],
618 }, 633 },
619 ], # targets 634 ], # targets
620 }], # "use_aura==1" 635 }], # "use_aura==1"
621 ], # conditions 636 ], # conditions
622 } 637 }
OLDNEW
« 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