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

Issues Search
    My Issues | Starred     Open | Closed | All

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: remove tabs from content.xml 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
« no previous file with comments | « base/android/jni_android.h ('k') | build/java.gypi » ('j') | content/android/java/content.xml » ('J')
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 7001af375add9c5f958d4b57d650d571718fec8a..f853956e88b2ba326b2571267748c91a47c3fb5a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2422,9 +2422,16 @@
'<(android_ndk_lib)/crtend_android.o',
],
}],
- ['_type=="shared_library"', {
+ ['_type=="shared_library" or _type=="loadable_module"', {
'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',
],
}],
],
« no previous file with comments | « base/android/jni_android.h ('k') | build/java.gypi » ('j') | content/android/java/content.xml » ('J')

Powered by Google App Engine
This is Rietveld 408576698