Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index c2f26efa08fa781bebc01ffeb018b26b1efe8ae7..d23352eed3add8e9a6148234e0980607114289dc 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -956,6 +956,9 @@ |
# Set to 1 to link against gsettings APIs instead of using dlopen(). |
'linux_link_gsettings%': 0, |
+ # Default arch variant for MIPS. |
+ 'mips_arch_variant%': 'mips32r2', |
+ |
# Enable use of OpenMAX DL FFT routines. |
'use_openmax_dl_fft%': '<(use_openmax_dl_fft)', |
@@ -1203,6 +1206,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-14/arch-mips', |
+ 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux-android-4.6/prebuilt/<(host_os)-x86/bin', |
+ }], |
], |
}, |
# Copy conditionally-set variables out one scope. |
@@ -2951,6 +2960,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', |
@@ -4262,7 +4295,7 @@ |
['LINK.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which g++))'], |
], |
}], |
- ['target_arch=="mipsel"', { |
+ ['OS=="linux" and target_arch=="mipsel"', { |
'make_global_settings': [ |
['CC', '<(sysroot)/../bin/mipsel-linux-gnu-gcc'], |
['CXX', '<(sysroot)/../bin/mipsel-linux-gnu-g++'], |