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

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

Issue 184433003: Prefer Khronos EGL headers instead Mesa for all OS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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
« no previous file with comments | « no previous file | no next file » | 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 9
10 'targets': [ 10 'targets': [
(...skipping 11 matching lines...) Expand all
22 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', 22 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
23 ], 23 ],
24 'variables': { 24 'variables': {
25 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gl', 25 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gl',
26 }, 26 },
27 'defines': [ 27 'defines': [
28 'GL_IMPLEMENTATION', 28 'GL_IMPLEMENTATION',
29 ], 29 ],
30 'include_dirs': [ 30 'include_dirs': [
31 '<(DEPTH)/third_party/swiftshader/include', 31 '<(DEPTH)/third_party/swiftshader/include',
32 '<(DEPTH)/third_party/khronos',
32 '<(DEPTH)/third_party/mesa/src/include', 33 '<(DEPTH)/third_party/mesa/src/include',
no sievers 2014/02/28 20:53:26 Can we remove mesa here? We already specify the e
Ken Russell (switch to Gerrit) 2014/02/28 21:25:04 I don't know -- a try job would be needed. In gene
33 '<(gl_binding_output_dir)', 34 '<(gl_binding_output_dir)',
34 ], 35 ],
35 'direct_dependent_settings': { 36 'direct_dependent_settings': {
36 'include_dirs': [ 37 'include_dirs': [
37 '<(gl_binding_output_dir)', 38 '<(gl_binding_output_dir)',
38 ], 39 ],
39 }, 40 },
40 'export_dependent_settings': [ 41 'export_dependent_settings': [
41 '<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers', 42 '<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers',
42 ], 43 ],
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 'variables': { 354 'variables': {
354 'jni_gen_package': 'ui/gl', 355 'jni_gen_package': 'ui/gl',
355 'jni_generator_ptr_type': 'long', 356 'jni_generator_ptr_type': 'long',
356 }, 357 },
357 'includes': [ '../../build/jni_generator.gypi' ], 358 'includes': [ '../../build/jni_generator.gypi' ],
358 }, 359 },
359 ], 360 ],
360 }], 361 }],
361 ], 362 ],
362 } 363 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698