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

Unified 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: added a comment 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/java_apk.gypi ('k') | chrome/chrome_android.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/chrome_apk.gypi
diff --git a/chrome/android/chrome_apk.gypi b/chrome/android/chrome_apk.gypi
index f1143b8a0fa7e7cf5512c4e73cc486a6f5105448..feee8a2bcd792ce67e4d8f5015a6d47369fc4fdb 100644
--- a/chrome/android/chrome_apk.gypi
+++ b/chrome/android/chrome_apk.gypi
@@ -25,7 +25,7 @@
'proguard_flags_paths': ['<(DEPTH)/chrome/android/java/proguard.flags'],
'additional_input_paths' : ['<@(chrome_android_pak_output_resources)'],
'conditions': [
- ['component != "shared_library"', {
+ ['android_must_copy_system_libraries == 0', {
# Only enable the chromium linker on regular builds, since the
# component build crashes on Android 4.4. See b/11379966
'use_chromium_linker': '<(chrome_apk_use_chromium_linker)',
« no previous file with comments | « build/java_apk.gypi ('k') | chrome/chrome_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698