Implement the skeleton of an android content shell.
Many TODOs here that will allow a quicker distribution of work to get the
remaining pieces upstreamed.
BUG=118591
TEST=
Review URL: http://codereview.chromium.org/10035034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133857 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index 58890452..3c2ba260 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2450,12 +2450,14 @@
['_type=="shared_library"', {
'ldflags': [
'-Wl,-shared,-Bsymbolic',
+ # crtbegin_so.o should be the last item in ldflags.
+ '<(android_ndk_lib)/crtbegin_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' ],
+ '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',
+ ],
}],
],
}],
