diff options
Diffstat (limited to 'tests/device/test-cpufeatures/jni/Android.mk')
| -rw-r--r-- | tests/device/test-cpufeatures/jni/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/device/test-cpufeatures/jni/Android.mk b/tests/device/test-cpufeatures/jni/Android.mk index 8b20bd0aa..858423c6f 100644 --- a/tests/device/test-cpufeatures/jni/Android.mk +++ b/tests/device/test-cpufeatures/jni/Android.mk @@ -26,8 +26,14 @@ LOCAL_STATIC_LIBRARIES := cpufeatures include $(BUILD_EXECUTABLE) endif +# Disable the following tests for GCC4.6/binutils-2.21 as well because +# platform libs are now built with the new default GCC4.8/binutils-2.24, and crt*.o +# generated by it can't be used by GCC4.6/binutils-2.21 due to inconsistency in +# usage of Tag involves DIV +# ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +ifneq ($(NDK_TOOLCHAIN_VERSION),4.6) include $(CLEAR_VARS) LOCAL_MODULE := test_arm_idiv_support LOCAL_SRC_FILES := test_arm_idiv.c @@ -49,5 +55,6 @@ LOCAL_STATIC_LIBRARIES := cpufeatures include $(BUILD_EXECUTABLE) endif endif +endif $(call import-module,android/cpufeatures) |