OLD | NEW |
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 'content_shell_product_name': 'Content Shell', | 7 'content_shell_product_name': 'Content Shell', |
8 # The "19" is so that sites that sniff for version think that this is | 8 # The "19" is so that sites that sniff for version think that this is |
9 # something reasonably current; the "77.34.5" is a hint that this isn't a | 9 # something reasonably current; the "77.34.5" is a hint that this isn't a |
10 # standard Chrome. | 10 # standard Chrome. |
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
649 'sources': [ | 649 'sources': [ |
650 'shell/android/shell_library_loader.cc', | 650 'shell/android/shell_library_loader.cc', |
651 'shell/android/shell_library_loader.h', | 651 'shell/android/shell_library_loader.h', |
652 ], | 652 ], |
653 'conditions': [ | 653 'conditions': [ |
654 ['android_webview_build==1', { | 654 ['android_webview_build==1', { |
655 'ldflags': [ | 655 'ldflags': [ |
656 '-lgabi++', # For rtti | 656 '-lgabi++', # For rtti |
657 ], | 657 ], |
658 }], | 658 }], |
| 659 ['android_app_abi != "x86"', { |
| 660 'ldflags': [ |
| 661 # Do not allow text relocations. |
| 662 '-Wl,--fatal-warnings', |
| 663 '-Wl,--warn-shared-textrel', |
| 664 ], |
| 665 }], |
659 ], | 666 ], |
660 }, | 667 }, |
661 { | 668 { |
662 'target_name': 'content_shell_java', | 669 'target_name': 'content_shell_java', |
663 'type': 'none', | 670 'type': 'none', |
664 'dependencies': [ | 671 'dependencies': [ |
665 'content.gyp:content_java', | 672 'content.gyp:content_java', |
666 ], | 673 ], |
667 'variables': { | 674 'variables': { |
668 'java_in_dir': '../content/shell/android/java', | 675 'java_in_dir': '../content/shell/android/java', |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
706 'native_lib_target': 'libcontent_shell_content_view', | 713 'native_lib_target': 'libcontent_shell_content_view', |
707 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont
ent_shell.pak'], | 714 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont
ent_shell.pak'], |
708 'asset_location': '<(ant_build_out)/content_shell/assets', | 715 'asset_location': '<(ant_build_out)/content_shell/assets', |
709 }, | 716 }, |
710 'includes': [ '../build/java_apk.gypi' ], | 717 'includes': [ '../build/java_apk.gypi' ], |
711 }, | 718 }, |
712 ], | 719 ], |
713 }], # OS=="android" | 720 }], # OS=="android" |
714 ] | 721 ] |
715 } | 722 } |
OLD | NEW |