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

Side by Side Diff: content/content.gyp

Issue 12524008: Android: factor out use of SDK jar. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove input_jar_file altogether. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « build/java.gypi ('k') | media/media.gyp » ('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, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
9 'conditions': [ 9 'conditions': [
10 ['inside_chromium_build==0', { 10 ['inside_chromium_build==0', {
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 'template_deps': ['public/common/result_codes_list.h'], 353 'template_deps': ['public/common/result_codes_list.h'],
354 }, 354 },
355 'includes': [ '../build/android/java_cpp_template.gypi' ], 355 'includes': [ '../build/android/java_cpp_template.gypi' ],
356 }, 356 },
357 { 357 {
358 'target_name': 'surface_texture_jni_headers', 358 'target_name': 'surface_texture_jni_headers',
359 'type': 'none', 359 'type': 'none',
360 'variables': { 360 'variables': {
361 'jni_gen_package': 'content', 361 'jni_gen_package': 'content',
362 'input_java_class': 'android/graphics/SurfaceTexture.class', 362 'input_java_class': 'android/graphics/SurfaceTexture.class',
363 'input_jar_file': '<(android_sdk)/android.jar',
364 }, 363 },
365 'includes': [ '../build/jar_file_jni_generator.gypi' ], 364 'includes': [ '../build/jar_file_jni_generator.gypi' ],
366 }, 365 },
367 { 366 {
368 'target_name': 'surface_jni_headers', 367 'target_name': 'surface_jni_headers',
369 'type': 'none', 368 'type': 'none',
370 'variables': { 369 'variables': {
371 'jni_gen_package': 'content', 370 'jni_gen_package': 'content',
372 'input_java_class': 'android/view/Surface.class', 371 'input_java_class': 'android/view/Surface.class',
373 'input_jar_file': '<(android_sdk)/android.jar',
374 }, 372 },
375 'includes': [ '../build/jar_file_jni_generator.gypi' ], 373 'includes': [ '../build/jar_file_jni_generator.gypi' ],
376 }, 374 },
377 { 375 {
378 'target_name': 'java_set_jni_headers', 376 'target_name': 'java_set_jni_headers',
379 'type': 'none', 377 'type': 'none',
380 'variables': { 378 'variables': {
381 'jni_gen_package': 'content', 379 'jni_gen_package': 'content',
382 'input_java_class': 'java/util/HashSet.class', 380 'input_java_class': 'java/util/HashSet.class',
383 'input_jar_file': '<(android_sdk)/android.jar',
384 }, 381 },
385 'includes': [ '../build/jar_file_jni_generator.gypi' ], 382 'includes': [ '../build/jar_file_jni_generator.gypi' ],
386 }, 383 },
387 384
388 { 385 {
389 'target_name': 'content_jni_headers', 386 'target_name': 'content_jni_headers',
390 'type': 'none', 387 'type': 'none',
391 'dependencies': [ 388 'dependencies': [
392 'java_set_jni_headers', 389 'java_set_jni_headers',
393 'surface_texture_jni_headers', 390 'surface_texture_jni_headers',
394 'surface_jni_headers', 391 'surface_jni_headers',
395 ], 392 ],
396 'direct_dependent_settings': { 393 'direct_dependent_settings': {
397 'include_dirs': [ 394 'include_dirs': [
398 '<(SHARED_INTERMEDIATE_DIR)/content', 395 '<(SHARED_INTERMEDIATE_DIR)/content',
399 ], 396 ],
400 }, 397 },
401 'includes': [ 'content_jni.gypi' ], 398 'includes': [ 'content_jni.gypi' ],
402 }, 399 },
403 ], 400 ],
404 }], # OS == "android" 401 }], # OS == "android"
405 ], 402 ],
406 } 403 }
OLDNEW
« no previous file with comments | « build/java.gypi ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698