diff options
author | Elliott Hughes <enh@google.com> | 2014-07-09 16:41:04 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2014-07-09 16:41:04 -0700 |
commit | cb7aae167e016a7fb85e64c9245f18d72a4a375b (patch) | |
tree | f2c00fb2c3eba39d40f91aa8f226c1569829928c /debuggerd/Android.mk | |
parent | b518659848b6f3f939e1b5b150ae8586b9b8d0ce (diff) |
Fix arm emulator "D register out of range for selected VFP version" build failure.
Change-Id: Ia37cb3f8ecb00a927fa3fc8b4131c158413646e7
Diffstat (limited to 'debuggerd/Android.mk')
-rw-r--r-- | debuggerd/Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk index 191e283b7..c33b263ad 100644 --- a/debuggerd/Android.mk +++ b/debuggerd/Android.mk @@ -38,6 +38,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include $(BUILD_EXECUTABLE) + + include $(CLEAR_VARS) LOCAL_SRC_FILES := crasher.c LOCAL_SRC_FILES_arm := arm/crashglue.S @@ -52,6 +54,11 @@ LOCAL_CFLAGS += -fstack-protector-all -Werror -Wno-free-nonheap-object #LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_SHARED_LIBRARIES := libcutils liblog libc +# The arm emulator has VFP but not VFPv3-D32. +ifeq ($(ARCH_ARM_HAVE_VFP_D32),true) +LOCAL_ASFLAGS_arm += -DHAS_VFP_D32 +endif + LOCAL_MODULE := crasher LOCAL_MODULE_STEM_32 := crasher LOCAL_MODULE_STEM_64 := crasher64 |