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

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

Issue 292433004: Revert 270750 "Android: cleans up jni_generator_ptr_type." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | « trunk/src/ui/gfx/gfx.gyp ('k') | 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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 ], 341 ],
342 'conditions': [ 342 'conditions': [
343 ['OS=="android"' , { 343 ['OS=="android"' , {
344 'targets': [ 344 'targets': [
345 { 345 {
346 'target_name': 'surface_jni_headers', 346 'target_name': 'surface_jni_headers',
347 'type': 'none', 347 'type': 'none',
348 'variables': { 348 'variables': {
349 'jni_gen_package': 'ui/gl', 349 'jni_gen_package': 'ui/gl',
350 'input_java_class': 'android/view/Surface.class', 350 'input_java_class': 'android/view/Surface.class',
351 'jni_generator_ptr_type': 'long',
351 }, 352 },
352 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 353 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
353 }, 354 },
354 { 355 {
355 'target_name': 'gl_jni_headers', 356 'target_name': 'gl_jni_headers',
356 'type': 'none', 357 'type': 'none',
357 'dependencies': [ 358 'dependencies': [
358 'surface_jni_headers', 359 'surface_jni_headers',
359 ], 360 ],
360 'sources': [ 361 'sources': [
361 '../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrappe r.java', 362 '../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrappe r.java',
362 '../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java' , 363 '../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java' ,
363 ], 364 ],
364 'variables': { 365 'variables': {
365 'jni_gen_package': 'ui/gl', 366 'jni_gen_package': 'ui/gl',
367 'jni_generator_ptr_type': 'long',
366 }, 368 },
367 'includes': [ '../../build/jni_generator.gypi' ], 369 'includes': [ '../../build/jni_generator.gypi' ],
368 }, 370 },
369 ], 371 ],
370 }], 372 }],
371 ], 373 ],
372 } 374 }
OLDNEW
« no previous file with comments | « trunk/src/ui/gfx/gfx.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698