ART: Do not use vixld - workaround to fix dex2oatds.
This is a quick workaround for ODR violations caused
by linking libvixl.a compiled without VIXL_DEBUG with
the libartd-compiler.a compiled with VIXL_DEBUG.
Bug: 27588884
Change-Id: Ib1af165f177f125f03cdd99777dff4c2912f6405
diff --git a/compiler/Android.mk b/compiler/Android.mk
index 7a257b6..11ee6dd 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -330,9 +330,9 @@
# Vixl assembly support for ARM64 targets.
ifeq ($$(art_ndebug_or_debug),debug)
ifeq ($$(art_static_or_shared), static)
- LOCAL_WHOLESTATIC_LIBRARIES += libvixld
+ LOCAL_WHOLESTATIC_LIBRARIES += libvixl
else
- LOCAL_SHARED_LIBRARIES += libvixld
+ LOCAL_SHARED_LIBRARIES += libvixl
endif
else
ifeq ($$(art_static_or_shared), static)