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

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

Issue 1635243002: On X11, copy ANGLE's libraries instead of using the _ANGLE version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | ui/gl/gl_implementation_x11.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 9
10 'targets': [ 10 'targets': [
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 'all_dependent_settings': { 179 'all_dependent_settings': {
180 'defines': [ 180 'defines': [
181 'GL_GLEXT_PROTOTYPES', 181 'GL_GLEXT_PROTOTYPES',
182 ], 182 ],
183 }, 183 },
184 'dependencies': [ 184 'dependencies': [
185 '<(DEPTH)/build/linux/system.gyp:x11', 185 '<(DEPTH)/build/linux/system.gyp:x11',
186 '<(DEPTH)/build/linux/system.gyp:xcomposite', 186 '<(DEPTH)/build/linux/system.gyp:xcomposite',
187 '<(DEPTH)/build/linux/system.gyp:xext', 187 '<(DEPTH)/build/linux/system.gyp:xext',
188 '<(DEPTH)/ui/events/platform/events_platform.gyp:events_platform', 188 '<(DEPTH)/ui/events/platform/events_platform.gyp:events_platform',
189 '<(DEPTH)/third_party/angle/src/angle.gyp:libEGL_ANGLE',
190 '<(DEPTH)/third_party/angle/src/angle.gyp:libGLESv2_ANGLE',
191 '<(DEPTH)/ui/gfx/x/gfx_x11.gyp:gfx_x11', 189 '<(DEPTH)/ui/gfx/x/gfx_x11.gyp:gfx_x11',
192 ], 190 ],
191 'copies': [{
192 'destination': '<(PRODUCT_DIR)',
193 'files':
194 [
195 "<(PRODUCT_DIR)/lib/libEGL.so",
196 "<(PRODUCT_DIR)/lib/libGLESv2.so",
197 ],
198 }],
193 }], 199 }],
194 ['OS=="win"', { 200 ['OS=="win"', {
195 'sources': [ 201 'sources': [
196 'angle_platform_impl.cc', 202 'angle_platform_impl.cc',
197 'angle_platform_impl.h', 203 'angle_platform_impl.h',
198 'gl_bindings_autogen_wgl.cc', 204 'gl_bindings_autogen_wgl.cc',
199 'gl_bindings_autogen_wgl.h', 205 'gl_bindings_autogen_wgl.h',
200 'gl_context_wgl.cc', 206 'gl_context_wgl.cc',
201 'gl_context_wgl.h', 207 'gl_context_wgl.h',
202 'gl_egl_api_implementation.cc', 208 'gl_egl_api_implementation.cc',
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 ], 366 ],
361 'variables': { 367 'variables': {
362 'jni_gen_package': 'ui/gl', 368 'jni_gen_package': 'ui/gl',
363 }, 369 },
364 'includes': [ '../../build/jni_generator.gypi' ], 370 'includes': [ '../../build/jni_generator.gypi' ],
365 }, 371 },
366 ], 372 ],
367 }], 373 }],
368 ], 374 ],
369 } 375 }
OLDNEW
« no previous file with comments | « no previous file | ui/gl/gl_implementation_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698