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

Side by Side Diff: ui/aura/aura.gyp

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 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 | « media/tools/tile_render_bench/tile_render_bench.cc ('k') | ui/aura/test/test_suite.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 { 218 {
219 'target_name': 'aura_unittests', 219 'target_name': 'aura_unittests',
220 'type': 'executable', 220 'type': 'executable',
221 'dependencies': [ 221 'dependencies': [
222 '../../base/base.gyp:test_support_base', 222 '../../base/base.gyp:test_support_base',
223 '../../chrome/chrome_resources.gyp:packed_resources', 223 '../../chrome/chrome_resources.gyp:packed_resources',
224 '../../skia/skia.gyp:skia', 224 '../../skia/skia.gyp:skia',
225 '../../testing/gtest.gyp:gtest', 225 '../../testing/gtest.gyp:gtest',
226 '../compositor/compositor.gyp:compositor_test_support', 226 '../compositor/compositor.gyp:compositor_test_support',
227 '../compositor/compositor.gyp:compositor', 227 '../compositor/compositor.gyp:compositor',
228 '../gfx/gl/gl.gyp:gl', 228 '../gl/gl.gyp:gl',
229 '../ui.gyp:gfx_resources', 229 '../ui.gyp:gfx_resources',
230 '../ui.gyp:ui', 230 '../ui.gyp:ui',
231 '../ui.gyp:ui_resources', 231 '../ui.gyp:ui_resources',
232 'test_support_aura', 232 'test_support_aura',
233 'aura', 233 'aura',
234 ], 234 ],
235 'include_dirs': [ 235 'include_dirs': [
236 '..', 236 '..',
237 ], 237 ],
238 'sources': [ 238 'sources': [
(...skipping 12 matching lines...) Expand all
251 # osmesa GL implementation is used on linux. 251 # osmesa GL implementation is used on linux.
252 ['OS=="linux"', { 252 ['OS=="linux"', {
253 'dependencies': [ 253 'dependencies': [
254 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 254 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
255 ], 255 ],
256 }], 256 }],
257 ], 257 ],
258 }, 258 },
259 ], 259 ],
260 } 260 }
OLDNEW
« no previous file with comments | « media/tools/tile_render_bench/tile_render_bench.cc ('k') | ui/aura/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698