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

Side by Side Diff: content/content.gyp

Issue 141223002: Move the android library loader from content to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix final nits Created 6 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
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 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine. 8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine.
9 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 9 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
10 }, 10 },
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 'variables': { 364 'variables': {
365 'aidl_interface_file': 'public/android/java/src/org/chromium/content /common/common.aidl', 365 'aidl_interface_file': 'public/android/java/src/org/chromium/content /common/common.aidl',
366 }, 366 },
367 'sources': [ 367 'sources': [
368 'public/android/java/src/org/chromium/content/common/IChildProcessCa llback.aidl', 368 'public/android/java/src/org/chromium/content/common/IChildProcessCa llback.aidl',
369 'public/android/java/src/org/chromium/content/common/IChildProcessSe rvice.aidl', 369 'public/android/java/src/org/chromium/content/common/IChildProcessSe rvice.aidl',
370 ], 370 ],
371 'includes': [ '../build/java_aidl.gypi' ], 371 'includes': [ '../build/java_aidl.gypi' ],
372 }, 372 },
373 { 373 {
374 'target_name': 'content_native_libraries_gen',
375 'type': 'none',
376 'sources': [
377 'public/android/java/templates/NativeLibraries.template',
378 ],
379 'variables': {
380 'package_name': 'org/chromium/content/app',
381 'include_path': 'public/android/java/templates',
382 'template_deps': [
383 'public/android/java/templates/native_libraries_array.h'
384 ],
385 },
386 'includes': [ '../build/android/java_cpp_template.gypi' ],
387 },
388 {
389 'target_name': 'content_java', 374 'target_name': 'content_java',
390 'type': 'none', 375 'type': 'none',
391 'dependencies': [ 376 'dependencies': [
392 '../base/base.gyp:base', 377 '../base/base.gyp:base',
393 '../media/media.gyp:media_java', 378 '../media/media.gyp:media_java',
394 '../net/net.gyp:net', 379 '../net/net.gyp:net',
395 '../ui/android/ui_android.gyp:ui_java', 380 '../ui/android/ui_android.gyp:ui_java',
396 'common_aidl', 381 'common_aidl',
397 'content_common', 382 'content_common',
398 'page_transition_types_java', 383 'page_transition_types_java',
399 'popup_item_type_java', 384 'popup_item_type_java',
400 'result_codes_java', 385 'result_codes_java',
401 'speech_recognition_error_java', 386 'speech_recognition_error_java',
402 'top_controls_state_java', 387 'top_controls_state_java',
403 'content_native_libraries_gen',
404 ], 388 ],
405 'variables': { 389 'variables': {
406 'java_in_dir': '../content/public/android/java', 390 'java_in_dir': '../content/public/android/java',
407 'jar_excluded_classes': [ '*/NativeLibraries.class' ],
408 'has_java_resources': 1, 391 'has_java_resources': 1,
409 'R_package': 'org.chromium.content', 392 'R_package': 'org.chromium.content',
410 'R_package_relpath': 'org/chromium/content', 393 'R_package_relpath': 'org/chromium/content',
411 'java_strings_grd': 'android_content_strings.grd', 394 'java_strings_grd': 'android_content_strings.grd',
412 }, 395 },
413 'conditions': [ 396 'conditions': [
414 ['android_webview_build == 0', { 397 ['android_webview_build == 0', {
415 'dependencies': [ 398 'dependencies': [
416 '../third_party/eyesfree/eyesfree.gyp:eyesfree_java', 399 '../third_party/eyesfree/eyesfree.gyp:eyesfree_java',
417 '../third_party/guava/guava.gyp:guava_javalib', 400 '../third_party/guava/guava.gyp:guava_javalib',
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 }, 484 },
502 { 485 {
503 'target_name': 'content_jni_headers', 486 'target_name': 'content_jni_headers',
504 'type': 'none', 487 'type': 'none',
505 'dependencies': [ 488 'dependencies': [
506 'java_set_jni_headers', 489 'java_set_jni_headers',
507 'motionevent_jni_headers' 490 'motionevent_jni_headers'
508 ], 491 ],
509 'includes': [ 'content_jni.gypi' ], 492 'includes': [ 'content_jni.gypi' ],
510 }, 493 },
511 {
512 'target_name': 'content_android_linker',
513 'type': 'shared_library',
514 'conditions': [
515 ['android_webview_build == 0', {
516 # Avoid breaking the webview build because it doesn't have
517 # <(android_ndk_root)/crazy_linker.gyp. Note that it never uses
518 # the linker anyway.
519 'sources': [
520 'common/android/linker/linker_jni.cc',
521 ],
522 'dependencies': [
523 '<(android_ndk_root)/crazy_linker.gyp:crazy_linker',
524 ],
525 }],
526 ],
527 },
528
529 ], 494 ],
530 }], # OS == "android" 495 }], # OS == "android"
531 ], 496 ],
532 } 497 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698