commit 195c576fbff290d4c313b67ed24ca36f2531acc4
author Serban Constantinescu <serban.constantinescu@arm.com> Thu Nov 13 11:14:25 2014 +0000
committer Serban Constantinescu <serban.constantinescu@arm.com> Fri Nov 14 19:02:47 2014 +0000
tree 0565c97102cc73fa989b6df822b9f2b3f1022a6c
parent ff5298ff1640b730ee62c90ca78fc96b7ee82ec4

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 <serban.constantinescu@arm.com>

compiler/Android.mk

diff --git a/compiler/Android.mk b/compiler/Android.mk
index 610f453..037946b 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -275,7 +275,11 @@
   LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk
   LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
   # Vixl assembly support for ARM64 targets.
-  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)
     # For atrace.
     LOCAL_SHARED_LIBRARIES += libcutils