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

Side by Side Diff: content/content.gyp

Issue 111493006: Have jni_generator.gypi specify include_dirs to dependent targets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove export_dependent_settings Created 7 years 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 | « components/web_contents_delegate_android.gypi ('k') | content/content_shell.gypi » ('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 '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 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 'input_java_class': 'java/util/HashSet.class', 488 'input_java_class': 'java/util/HashSet.class',
489 }, 489 },
490 'includes': [ '../build/jar_file_jni_generator.gypi' ], 490 'includes': [ '../build/jar_file_jni_generator.gypi' ],
491 }, 491 },
492 { 492 {
493 'target_name': 'content_jni_headers', 493 'target_name': 'content_jni_headers',
494 'type': 'none', 494 'type': 'none',
495 'dependencies': [ 495 'dependencies': [
496 'java_set_jni_headers' 496 'java_set_jni_headers'
497 ], 497 ],
498 'direct_dependent_settings': {
499 'include_dirs': [
500 '<(SHARED_INTERMEDIATE_DIR)/content',
501 ],
502 },
503 'includes': [ 'content_jni.gypi' ], 498 'includes': [ 'content_jni.gypi' ],
504 }, 499 },
505 { 500 {
506 'target_name': 'content_android_linker', 501 'target_name': 'content_android_linker',
507 'type': 'shared_library', 502 'type': 'shared_library',
508 'conditions': [ 503 'conditions': [
509 ['android_webview_build == 0', { 504 ['android_webview_build == 0', {
510 # Avoid breaking the webview build because it doesn't have 505 # Avoid breaking the webview build because it doesn't have
511 # <(android_ndk_root)/crazy_linker.gyp. Note that it never uses 506 # <(android_ndk_root)/crazy_linker.gyp. Note that it never uses
512 # the linker anyway. 507 # the linker anyway.
513 'sources': [ 508 'sources': [
514 'common/android/linker/linker_jni.cc', 509 'common/android/linker/linker_jni.cc',
515 ], 510 ],
516 'dependencies': [ 511 'dependencies': [
517 '<(android_ndk_root)/crazy_linker.gyp:crazy_linker', 512 '<(android_ndk_root)/crazy_linker.gyp:crazy_linker',
518 ], 513 ],
519 }], 514 }],
520 ], 515 ],
521 }, 516 },
522 517
523 ], 518 ],
524 }], # OS == "android" 519 }], # OS == "android"
525 ], 520 ],
526 } 521 }
OLDNEW
« no previous file with comments | « components/web_contents_delegate_android.gypi ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698