Chromium Code Reviews| 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"', { |
|
John Grabowski
2012/04/19 18:55:27
Can you briefly tell me why we're using loadable_m
Ted C
2012/04/19 23:21:07
This was taken from downstream to make skia happy
|
| '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', |
| ], |
| }], |
| ], |