Chromium Code Reviews| Index: build/android.gypi |
| diff --git a/build/android.gypi b/build/android.gypi |
| index 67a9d35820884478d8f43fa96775d4a0aa218e46..092d98af03a747c2608c9d4d5bd0b0b03dcf737b 100644 |
| --- a/build/android.gypi |
| +++ b/build/android.gypi |
| @@ -160,6 +160,24 @@ |
| '-mfpu=vfp3', |
| ], |
| }], |
| + ['target_arch=="mipsel"', { |
|
Jakob Kummerow
2013/02/12 11:59:39
Are you sure this block of changes is necessary? W
Paul Lind
2013/02/25 16:23:22
Duplicated block was removed.
|
| + 'cflags': [ |
| + '-EL', |
| + ], |
| + 'conditions': [ |
| + ['mips_arch_variant=="mips32r2"', { |
| + 'cflags': ['-mips32r2', '-Wa,-mips32r2'], |
| + }], |
| + ['mips_arch_variant=="loongson"', { |
| + 'cflags': ['-mips3', '-Wa,-mips3'], |
| + }, { |
| + 'cflags': ['-mips32', '-Wa,-mips32'], |
| + }], |
| + ], |
| + 'ldflags': [ |
| + '-EL', |
| + ], |
| + }], |
| # NOTE: The stlport header include paths below are specified in |
| # cflags rather than include_dirs because they need to come |
| # after include_dirs. Think of them like system headers, but |
| @@ -181,6 +199,11 @@ |
| '-L<(android_stlport_libs)/armeabi', |
| ], |
| }], |
| + ['target_arch=="mipsel"', { |
| + 'ldflags': [ |
| + '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/mips', |
| + ], |
| + }], |
| ['target_arch=="ia32"', { |
| 'ldflags': [ |
| '-L<(android_stlport_libs)/x86', |
| @@ -197,6 +220,16 @@ |
| '-fno-stack-protector', |
| ], |
| }], |
| + ['target_arch=="mipsel"', { |
| + # The mips toolchain currently has problems with stack-protector. |
| + 'cflags!': [ |
| + '-fstack-protector', |
| + '-U__linux__' |
| + ], |
| + 'cflags': [ |
| + '-fno-stack-protector', |
| + ], |
| + }], |
| ], |
| 'target_conditions': [ |
| ['_type=="executable"', { |