From 195c576fbff290d4c313b67ed24ca36f2531acc4 Mon Sep 17 00:00:00 2001 From: Serban Constantinescu Date: Thu, 13 Nov 2014 11:14:25 +0000 Subject: Arm64: Use the debug version of VIXL for debug builds. This patch builds the debug version of ART against VIXL debug. In this way VIXL will assert misuses of the assembler and disassembler. Change-Id: Ic4654eb20e420f23b40e96a69be452dc50770c1c Signed-off-by: Serban Constantinescu --- disassembler/Android.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'disassembler') diff --git a/disassembler/Android.mk b/disassembler/Android.mk index f2dd1ee..743d45a 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -85,7 +85,11 @@ define build-libart-disassembler LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include external/libcxx/libcxx.mk # For disassembler_arm64. - LOCAL_SHARED_LIBRARIES += libvixl + ifeq ($$(art_ndebug_or_debug),debug) + LOCAL_SHARED_LIBRARIES += libvixld + else + LOCAL_SHARED_LIBRARIES += libvixl + endif ifeq ($$(art_target_or_host),target) include $(BUILD_SHARED_LIBRARY) else # host -- cgit v1.1