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

Side by Side Diff: chrome/android/chrome_apk.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
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 'variables': { 6 'variables': {
7 'native_lib_placeholders_file%': '', 7 'native_lib_placeholders_file%': '',
8 'chrome_apk_use_relocation_packer%': 1, 8 'chrome_apk_use_relocation_packer%': 1,
9 'conditions': [ 9 'conditions': [
10 # Use the chromium linker unless cygprofile instrumentation is active. 10 # Use the chromium linker unless cygprofile instrumentation is active.
11 # Chromium linker causes instrumentation to return incorrect results. 11 # Chromium linker causes instrumentation to return incorrect results.
12 ['order_profiling == 0', { 12 ['order_profiling == 0', {
13 'chrome_apk_use_chromium_linker%': 1, 13 'chrome_apk_use_chromium_linker%': 1,
14 'chrome_apk_load_library_from_zip%': 1, 14 'chrome_apk_load_library_from_zip%': 1,
15 }, { 15 }, {
16 'chrome_apk_use_chromium_linker%': 0, 16 'chrome_apk_use_chromium_linker%': 0,
17 'chrome_apk_load_library_from_zip%': 0, 17 'chrome_apk_load_library_from_zip%': 0,
18 }], 18 }],
19 ], 19 ],
20 }, 20 },
21 'asset_location': '<(PRODUCT_DIR)/assets/<(package_name)', 21 'asset_location': '<(PRODUCT_DIR)/assets/<(package_name)',
22 'java_in_dir_suffix': '/src_dummy', 22 'java_in_dir_suffix': '/src_dummy',
23 'native_lib_version_name': '<(version_full)', 23 'native_lib_version_name': '<(version_full)',
24 'proguard_enabled': 'true', 24 'proguard_enabled': 'true',
25 'proguard_flags_paths': ['<(DEPTH)/chrome/android/java/proguard.flags'], 25 'proguard_flags_paths': ['<(DEPTH)/chrome/android/java/proguard.flags'],
26 'additional_input_paths' : ['<@(chrome_android_pak_output_resources)'], 26 'additional_input_paths' : ['<@(chrome_android_pak_output_resources)'],
27 'conditions': [ 27 'conditions': [
28 ['component != "shared_library"', { 28 ['component != "shared_library" and android_libcpp_library != "c++_shared" ', {
29 # Only enable the chromium linker on regular builds, since the 29 # Only enable the chromium linker on regular builds, since the
30 # component build crashes on Android 4.4. See b/11379966 30 # component build crashes on Android 4.4. See b/11379966
31 'use_chromium_linker': '<(chrome_apk_use_chromium_linker)', 31 'use_chromium_linker': '<(chrome_apk_use_chromium_linker)',
32 'conditions': [ 32 'conditions': [
33 ['"<(native_lib_placeholders_file)" != ""', { 33 ['"<(native_lib_placeholders_file)" != ""', {
34 'native_lib_placeholders': ['<!@(cat <(native_lib_placeholders_file) )'], 34 'native_lib_placeholders': ['<!@(cat <(native_lib_placeholders_file) )'],
35 }], 35 }],
36 # Pack relocations where the chromium linker is enabled. Packing is 36 # Pack relocations where the chromium linker is enabled. Packing is
37 # a no-op if this is not a Release build. 37 # a no-op if this is not a Release build.
38 # TODO: Enable packed relocations for x64. See: b/20532404 38 # TODO: Enable packed relocations for x64. See: b/20532404
39 ['chrome_apk_use_chromium_linker == 1 and target_arch != "x64"', { 39 ['chrome_apk_use_chromium_linker == 1 and target_arch != "x64"', {
40 'use_relocation_packer': '<(chrome_apk_use_relocation_packer)', 40 'use_relocation_packer': '<(chrome_apk_use_relocation_packer)',
41 }], 41 }],
42 ], 42 ],
43 }], 43 }],
44 ], 44 ],
45 'run_findbugs': 0, 45 'run_findbugs': 0,
46 }, 46 },
47 'includes': [ '../../build/java_apk.gypi' ], 47 'includes': [ '../../build/java_apk.gypi' ],
48 } 48 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698