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

Side by Side Diff: ui/aura/aura.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 | « build/all.gyp ('k') | ui/aura/aura_test_base.h » ('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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 '../gfx/gl/gl.gyp:gl', 82 '../gfx/gl/gl.gyp:gl',
83 '../ui.gyp:gfx_resources', 83 '../ui.gyp:gfx_resources',
84 '../ui.gyp:ui', 84 '../ui.gyp:ui',
85 '../ui.gyp:ui_resources', 85 '../ui.gyp:ui_resources',
86 'aura', 86 'aura',
87 ], 87 ],
88 'include_dirs': [ 88 'include_dirs': [
89 '..', 89 '..',
90 ], 90 ],
91 'sources': [ 91 'sources': [
92 'window_unittest.cc', 92 'aura_test_base.cc',
93 'aura_test_base.h',
93 'run_all_unittests.cc', 94 'run_all_unittests.cc',
94 'test_suite.cc', 95 'test_suite.cc',
95 'test_suite.h', 96 'test_suite.h',
97 'window_unittest.cc',
98 '../gfx/compositor/test_compositor.cc',
99 '../gfx/compositor/test_compositor.h',
100 '../gfx/compositor/test_texture.cc',
101 '../gfx/compositor/test_texture.h',
96 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 102 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
97 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 103 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
98 ], 104 ],
99 # osmesa GL implementation is used on linux. 105 # osmesa GL implementation is used on linux.
100 'conditions': [ 106 'conditions': [
101 ['OS=="linux"', { 107 ['OS=="linux"', {
102 'dependencies': [ 108 'dependencies': [
103 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 109 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
104 ], 110 ],
105 }], 111 }],
106 ['OS!="mac"', { 112 ['OS!="mac"', {
107 'dependencies': [ 113 'dependencies': [
108 '../../chrome/chrome.gyp:packed_resources', 114 '../../chrome/chrome.gyp:packed_resources',
109 ], 115 ],
110 }], 116 }],
111 ], 117 ],
112 }, 118 },
113 ], 119 ],
114 } 120 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | ui/aura/aura_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698