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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_android.gypi

Issue 329223002: Android: enable chromium linker on the shells. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes relro bundle 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
« base/android/java/src/org/chromium/base/library_loader/Linker.java ('K') | « base/android/java/src/org/chromium/base/library_loader/Linker.java ('k') | content/content_shell.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_android.gypi
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index 0faa1a53526c917e68391187e53dbd542b92c49d..d986c571feb7bc7f7238ecf745eadda9e0e6e219 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -72,6 +72,13 @@
'additional_input_paths': [
'<@(chrome_android_pak_output_resources)',
],
+ 'conditions': [
+ ['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',
+ }],
+ ],
},
'includes': [ '../build/java_apk.gypi', ],
},
« base/android/java/src/org/chromium/base/library_loader/Linker.java ('K') | « base/android/java/src/org/chromium/base/library_loader/Linker.java ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698