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

Side by Side Diff: chrome/chrome_android.gypi

Issue 1263713005: Link libc++_shared with asan=1 on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 4 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
« build/common.gypi ('K') | « chrome/android/chrome_apk.gypi ('k') | no next file » | 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 'conditions': [ 7 'conditions': [
8 ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', { 8 ['android_must_copy_system_libraries == 0 and target_arch != "arm64" and t arget_arch != "x64" and profiling_full_stack_frames != 1', {
9 # Only enable the chromium linker on regular builds, since the 9 # Only enable the chromium linker on regular builds, since the
10 # component build crashes on Android 4.4. See b/11379966 10 # component build crashes on Android 4.4. See b/11379966
11 'use_chromium_linker': '1', 11 'use_chromium_linker': '1',
12 }], 12 }],
13 ], 13 ],
14 }, 14 },
15 'includes': [ 15 'includes': [
16 'chrome_android_paks.gypi', # Included for the list of pak resources. 16 'chrome_android_paks.gypi', # Included for the list of pak resources.
17 'chrome_shell.gypi', # Built atop chrome_android_core (defined here) 17 'chrome_shell.gypi', # Built atop chrome_android_core (defined here)
18 ], 18 ],
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 '-f', '<(branding_path)', 105 '-f', '<(branding_path)',
106 '-e', 'CHANNEL=str.upper("<(android_channel)")', 106 '-e', 'CHANNEL=str.upper("<(android_channel)")',
107 '<(template_input_path)', 107 '<(template_input_path)',
108 '<(output_path)', 108 '<(output_path)',
109 ], 109 ],
110 }, 110 },
111 ], 111 ],
112 }, 112 },
113 ], 113 ],
114 } 114 }
OLDNEW
« build/common.gypi ('K') | « chrome/android/chrome_apk.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698