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

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: Move content/android -> content/public/android 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:
View side-by-side diff with in-line comments
Download patch
« base/base.gypi ('K') | « base/base.gypi ('k') | build/java.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 429438efb7a5a6686e26fb42995553350b926159..d210bbbd0e36d0d5afe4251437553a7e990c666d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2427,12 +2427,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' ],
}],
],
}],
« base/base.gypi ('K') | « base/base.gypi ('k') | build/java.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698