content/content_shell.gypi - Issue 329223002: Android: enable chromium linker on the shells.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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:

Index: content/content_shell.gypi

diff --git a/content/content_shell.gypi b/content/content_shell.gypi

index bbf73046b59694ffb98521ae64de91cf34f9fcac..cdebab9da0126857cf075e057662cf084f365be0 100644

--- a/content/content_shell.gypi

+++ b/content/content_shell.gypi

@@ -1027,6 +1027,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': [