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

Unified 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: Comments 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_android.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 40ca9f6d7c2fef4bdcfe0ac5dfcac7fa6600a069..40faaccbbc26e13be0e25cce383b5f49d72ad558 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -1029,6 +1029,11 @@
'<(PRODUCT_DIR)/icudtl.dat',
],
}],
+ ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64"', {
+ # Only enable the chromium linker on regular builds, since the
+ # component build crashes on Android 4.4. See b/11379966
+ 'use_chromium_linker': '1',
+ }],
],
},
'conditions': [
« no previous file with comments | « chrome/chrome_android.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698