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

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

Issue 22824009: Remove StreamTextureManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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
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 22 matching lines...) Expand all
33 ], 33 ],
34 'direct_dependent_settings': { 34 'direct_dependent_settings': {
35 'include_dirs': [ 35 'include_dirs': [
36 '<(gl_binding_output_dir)', 36 '<(gl_binding_output_dir)',
37 ], 37 ],
38 }, 38 },
39 'export_dependent_settings': [ 39 'export_dependent_settings': [
40 '<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers', 40 '<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers',
41 ], 41 ],
42 'sources': [ 42 'sources': [
43 'android/gl_image_stream.cc',
44 'android/gl_image_stream.h',
piman 2013/08/12 23:22:07 These files are missing from the patch
43 'android/gl_jni_registrar.cc', 45 'android/gl_jni_registrar.cc',
44 'android/gl_jni_registrar.h', 46 'android/gl_jni_registrar.h',
45 'android/scoped_java_surface.cc', 47 'android/scoped_java_surface.cc',
46 'android/scoped_java_surface.h', 48 'android/scoped_java_surface.h',
47 'android/surface_texture_bridge.cc', 49 'android/surface_texture_bridge.cc',
48 'android/surface_texture_bridge.h', 50 'android/surface_texture_bridge.h',
49 'android/surface_texture_listener.cc', 51 'android/surface_texture_listener.cc',
50 'android/surface_texture_listener.h', 52 'android/surface_texture_listener.h',
51 'gl_bindings.h', 53 'gl_bindings.h',
52 'gl_bindings_skia_in_process.cc', 54 'gl_bindings_skia_in_process.cc',
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 '../..', 300 '../..',
299 ], 301 ],
300 'direct_dependent_settings': { 302 'direct_dependent_settings': {
301 'include_dirs': [ 303 'include_dirs': [
302 '<(gl_binding_output_dir)', 304 '<(gl_binding_output_dir)',
303 ], 305 ],
304 }, 306 },
305 'sources': [ 307 'sources': [
306 'gl_mock.h', 308 'gl_mock.h',
307 'gl_mock.cc', 309 'gl_mock.cc',
310 'gl_image_mock.h',
311 'gl_image_mock.cc',
308 '<(gl_binding_output_dir)/gl_mock_autogen_gl.h', 312 '<(gl_binding_output_dir)/gl_mock_autogen_gl.h',
309 ], 313 ],
310 }, 314 },
311 ], 315 ],
312 'conditions': [ 316 'conditions': [
313 ['OS=="android"' , { 317 ['OS=="android"' , {
314 'targets': [ 318 'targets': [
315 { 319 {
316 'target_name': 'surface_texture_jni_headers', 320 'target_name': 'surface_texture_jni_headers',
317 'type': 'none', 321 'type': 'none',
(...skipping 24 matching lines...) Expand all
342 ], 346 ],
343 'variables': { 347 'variables': {
344 'jni_gen_package': 'ui/gl', 348 'jni_gen_package': 'ui/gl',
345 }, 349 },
346 'includes': [ '../../build/jni_generator.gypi' ], 350 'includes': [ '../../build/jni_generator.gypi' ],
347 }, 351 },
348 ], 352 ],
349 }], 353 }],
350 ], 354 ],
351 } 355 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698