Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 8b7337c1ef4d31d11a58858d59996e0924d8cbb6..44551c60922e42e64ea7fb705959f6bf238ffbe3 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -941,6 +941,9 @@ |
| # arm_neon==0). |
| 'arm_fpu%': 'vfpv3', |
| + # Default arch variant for MIPS. |
| + 'mips_arch_variant%': 'mips32r2', |
| + |
| # Set ARM float abi compilation flag. |
| 'arm_float_abi%': 'softfp', |
| @@ -1192,6 +1195,12 @@ |
| 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-arm', |
| 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-androideabi-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin', |
| }], |
| + ['target_arch == "mipsel"', { |
| + 'android_app_abi%': 'mips', |
| + 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/gdbserver/gdbserver', |
| + 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-9/arch-mips', |
|
cjhopman
2013/04/19 18:02:10
should this be android-14 like arm/x86?
petarj
2013/04/21 01:17:14
Done.
|
| + 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux-android-4.6/prebuilt/<(host_os)-x86/bin', |
|
cjhopman
2013/04/19 18:02:10
"<(host_os)-<(android_host_arch)" instead of "<(ho
petarj
2013/04/21 01:17:14
We must force "linux-x86" for both "x86_64" and "x
|
| + }], |
| ], |
| }, |
| # Copy conditionally-set variables out one scope. |
| @@ -2627,6 +2636,10 @@ |
| '-Wl,--no-as-needed', |
| ], |
| }], |
| + ['target_arch == "mipsel"', { |
| + 'android_app_abi%': 'mips', |
| + 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-9/arch-mips', |
|
cjhopman
2013/04/19 18:02:10
These shouldn't need to be set here. It should jus
petarj
2013/04/21 01:17:14
Removed.
|
| + }], |
| ], |
| }, |
| 'Release_Base': { |
| @@ -2905,6 +2918,30 @@ |
| }], |
| ], |
| }], |
| + ['target_arch=="mipsel"', { |
| + 'target_conditions': [ |
| + ['_toolset=="target"', { |
| + 'conditions': [ |
| + ['mips_arch_variant=="mips32r2"', { |
| + 'cflags': ['-mips32r2', '-Wa,-mips32r2'], |
| + }, { |
| + 'cflags': ['-mips32', '-Wa,-mips32'], |
| + }], |
| + ], |
| + 'cflags': [ |
| + '-EL', |
| + '-mhard-float', |
| + ], |
| + 'ldflags': [ |
| + '-EL', |
| + '-Wl,--no-keep-memory' |
| + ], |
| + 'cflags_cc': [ |
| + '-Wno-uninitialized', |
| + ], |
| + }], |
| + ], |
| + }], |
| ['linux_fpic==1', { |
| 'cflags': [ |
| '-fPIC', |
| @@ -3306,6 +3343,12 @@ |
| '-target arm-linux-androideabi', |
| ], |
| }], |
| + ['target_arch=="mipsel"', { |
| + 'ldflags': [ |
| + '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/mips', |
| + '-L<(android_ndk_root)/sources/cxx-stl/gnu-libstdc++/4.6/libs/mips' |
|
cjhopman
2013/04/19 18:02:10
should this use the "-target" flag like arm/x86?
petarj
2013/04/21 01:17:14
Removed completely for now.
|
| + ], |
| + }], |
| ['target_arch=="ia32"', { |
| 'cflags': [ |
| '-target x86-linux-androideabi', |