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

Side by Side Diff: content/content.gyp

Issue 23717023: Android: Add chrome-specific dynamic linker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update content_tests.gypi Created 7 years, 2 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
« no previous file with comments | « content/common/android/linker/linker_jni.cc ('k') | content/content_tests.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 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 'dependencies': [ 483 'dependencies': [
484 'java_set_jni_headers', 484 'java_set_jni_headers',
485 ], 485 ],
486 'direct_dependent_settings': { 486 'direct_dependent_settings': {
487 'include_dirs': [ 487 'include_dirs': [
488 '<(SHARED_INTERMEDIATE_DIR)/content', 488 '<(SHARED_INTERMEDIATE_DIR)/content',
489 ], 489 ],
490 }, 490 },
491 'includes': [ 'content_jni.gypi' ], 491 'includes': [ 'content_jni.gypi' ],
492 }, 492 },
493 {
494 'target_name': 'content_android_linker',
495 'type': 'shared_library',
496 'conditions': [
497 ['android_webview_build == 0', {
498 # Avoid breaking the webview build because it doesn't have
499 # <(android_ndk_root)/crazy_linker.gyp. Note that it never uses
500 # the linker anyway.
501 'sources': [
502 'common/android/linker/linker_jni.cc',
503 ],
504 'dependencies': [
505 '<(android_ndk_root)/crazy_linker.gyp:crazy_linker',
506 ],
507 }],
508 ],
509 },
510
493 ], 511 ],
494 }], # OS == "android" 512 }], # OS == "android"
495 ], 513 ],
496 } 514 }
OLDNEW
« no previous file with comments | « content/common/android/linker/linker_jni.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698