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

Side by Side Diff: content/content_shell.gypi

Issue 329223002: Android: enable chromium linker on the shells. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes relro bundle Created 6 years, 6 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
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 '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 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
1020 'native_lib_target': 'libcontent_shell_content_view', 1020 'native_lib_target': 'libcontent_shell_content_view',
1021 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 1021 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
1022 'asset_location': '<(PRODUCT_DIR)/content_shell/assets', 1022 'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
1023 'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'], 1023 'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
1024 'conditions': [ 1024 'conditions': [
1025 ['icu_use_data_file_flag==1', { 1025 ['icu_use_data_file_flag==1', {
1026 'additional_input_paths': [ 1026 'additional_input_paths': [
1027 '<(PRODUCT_DIR)/icudtl.dat', 1027 '<(PRODUCT_DIR)/icudtl.dat',
1028 ], 1028 ],
1029 }], 1029 }],
1030 ['component != "shared_library" and target_arch != "arm64" and tar get_arch != "x64"', {
1031 # Only enable the chromium linker on regular builds, since the
1032 # component build crashes on Android 4.4. See b/11379966
1033 'use_chromium_linker': '1',
1034 }],
1030 ], 1035 ],
1031 }, 1036 },
1032 'conditions': [ 1037 'conditions': [
1033 ['android_webview_build==0', { 1038 ['android_webview_build==0', {
1034 'dependencies': [ 1039 'dependencies': [
1035 '../tools/imagediff/image_diff.gyp:image_diff#host', 1040 '../tools/imagediff/image_diff.gyp:image_diff#host',
1036 ], 1041 ],
1037 }], 1042 }],
1038 ], 1043 ],
1039 'includes': [ '../build/java_apk.gypi' ], 1044 'includes': [ '../build/java_apk.gypi' ],
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1096 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1092 '--destination_dir', '<(dest_dir)', 1097 '--destination_dir', '<(dest_dir)',
1093 ], 1098 ],
1094 }, 1099 },
1095 ], 1100 ],
1096 }, 1101 },
1097 ], 1102 ],
1098 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1103 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1099 ] 1104 ]
1100 } 1105 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698