| Index: build/android.gypi
|
| diff --git a/build/android.gypi b/build/android.gypi
|
| index 0ea899d6edd9d1896e3e0e17632ae0712cf97395..2f32be0e81f01908e1ab11c95d3353d0e44bfedf 100644
|
| --- a/build/android.gypi
|
| +++ b/build/android.gypi
|
| @@ -184,6 +184,11 @@
|
| '-L<(android_stlport_libs)/x86',
|
| ],
|
| }],
|
| + ['target_arch=="a64"', {
|
| + 'ldflags': [
|
| + '-L<(android_stlport_libs)/arm64',
|
| + ],
|
| + }],
|
| ],
|
| }],
|
| ['target_arch=="ia32"', {
|
| @@ -208,10 +213,19 @@
|
| ],
|
| 'target_conditions': [
|
| ['_type=="executable"', {
|
| + 'conditions': [
|
| + ['target_arch=="a64"', {
|
| + 'ldflags': [
|
| + '-Wl,-dynamic-linker,/system/bin/linker64',
|
| + ],
|
| + }, {
|
| + 'ldflags': [
|
| + '-Wl,-dynamic-linker,/system/bin/linker',
|
| + ],
|
| + }]
|
| + ],
|
| 'ldflags': [
|
| '-Bdynamic',
|
| - '-Wl,-dynamic-linker,/system/bin/linker',
|
| - '-Wl,--gc-sections',
|
| '-Wl,-z,nocopyreloc',
|
| # crtbegin_dynamic.o should be the last item in ldflags.
|
| '<(android_lib)/crtbegin_dynamic.o',
|
|
|