build/common.gypi - Issue 8938003: Set the compiler root directory for the Android NDK, merging two linker flags.

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: build/common.gypi

Issue 8938003: Set the compiler root directory for the Android NDK, merging two linker flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years 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

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index ec675c08b77e5a435912d05cb688e398f30b511a..9f98d20ba0582c7f6b5247baef357139a620a91b 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -2111,8 +2111,7 @@

'conditions': [

['android_build_type==0', {

'ldflags': [

- '-Wl,-rpath-link=<(android_ndk_lib)',

- '-L<(android_ndk_lib)',

+ '--sysroot=<(android_ndk_sysroot)',

}],

# NOTE: The stlport header include paths below are specified in

« no previous file with comments | « no previous file | no next file » | no next file with comments »