Index: chrome/android/chrome_apk.gypi |
diff --git a/chrome/android/chrome_apk.gypi b/chrome/android/chrome_apk.gypi |
index f1143b8a0fa7e7cf5512c4e73cc486a6f5105448..ab31634c0effdca6fd32f549e147769ec9a4eef8 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"', { |
+ ['component != "shared_library" and android_libcpp_library != "c++_shared"', { |
# 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)', |