| Index: build/android.gypi
|
| diff --git a/build/android.gypi b/build/android.gypi
|
| index 6c5ccbd5a0599c1bd7fe8f596e3482f5555318d7..5c6fb321b4a73da2302e064c699c5809fd89c52c 100644
|
| --- a/build/android.gypi
|
| +++ b/build/android.gypi
|
| @@ -179,7 +179,7 @@
|
| '-L<(android_stlport_libs)/mips',
|
| ],
|
| }],
|
| - ['target_arch=="ia32"', {
|
| + ['target_arch=="ia32" or target_arch=="x87"', {
|
| 'ldflags': [
|
| '-L<(android_stlport_libs)/x86',
|
| ],
|
| @@ -196,7 +196,7 @@
|
| }],
|
| ],
|
| }],
|
| - ['target_arch=="ia32"', {
|
| + ['target_arch=="ia32" or target_arch=="x87"', {
|
| # The x86 toolchain currently has problems with stack-protector.
|
| 'cflags!': [
|
| '-fstack-protector',
|
|
|