| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index eb3c74726507c8701e92a29d290b61d05ed13317..8f479d71a3977abef592bd781e8232eb0b972075 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -3545,13 +3545,19 @@
|
| ['_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',
|
| + 'conditions': [
|
| + ['android_webview_build==0', {
|
| + 'ldflags': [
|
| + # 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',
|
| + ],
|
| + }],
|
| ],
|
| }],
|
| ],
|
|
|