build/common.gypi - Issue 10035034: Implement the skeleton of an android content shell.

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 10035034: Implement the skeleton of an android content shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Removed drawable png as it was checked in separately. Created 8 years, 8 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: build/common.gypi

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

index db5bf662d30735af777d891a9887c975e5aea19a..7315d2dd191d31afb8376d8af90e00bcb6f64de0 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -2441,12 +2441,14 @@

['_type=="shared_library"', {

'ldflags': [

'-Wl,-shared,-Bsymbolic',

+ # crtbegin_so.o should be the last item in ldflags.

+ '<(android_ndk_lib)/crtbegin_so.o',

+ ],

+ 'libraries': [

+ # crtend_so.o needs to be the last item in libraries.

+ # Do not add any libraries after this!

+ '<(android_ndk_lib)/crtend_so.o',

- # Use of -nostdlib prevents the compiler from bringing

- # in crtbegin_dynamic.o et al, so we get an undefined

- # reference to ___dso_handle when building

- # gtest_target_type==shared_library.

- 'ldflags!': [ '-nostdlib' ],

}],