commit 847c8db052fcb3c1a945a8206547c409d3eb06fc
author Nicolas Geoffray <ngeoffray@google.com> Mon Nov 17 10:22:02 2014 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Nov 17 10:22:02 2014 +0000
tree 013b7081bf3805b25970dcd71ee18b79944fcab5
parent 195c576fbff290d4c313b67ed24ca36f2531acc4

Revert "Arm64: Use the debug version of VIXL for debug builds."

This reverts commit 195c576fbff290d4c313b67ed24ca36f2531acc4.

Change-Id: Id992a43ae346bb4c38a6c47639b02aea838d974a

compiler/Android.mk

diff --git a/compiler/Android.mk b/compiler/Android.mk
index 037946b..610f453 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -275,11 +275,7 @@
   LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk
   LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
   # Vixl assembly support for ARM64 targets.
-  ifeq ($$(art_ndebug_or_debug),debug)
-    LOCAL_SHARED_LIBRARIES += libvixld
-  else
-    LOCAL_SHARED_LIBRARIES += libvixl
-  endif
+  LOCAL_SHARED_LIBRARIES += libvixl
   ifeq ($$(art_target_or_host),target)
     # For atrace.
     LOCAL_SHARED_LIBRARIES += libcutils