commit 97c72b76cf776228196c6abd33973ef751de61ad
author Scott Wakeling <scott.wakeling@linaro.org> Fri Jun 24 16:19:36 2016 +0100
committer Scott Wakeling <scott.wakeling@linaro.org> Fri Jul 15 09:48:07 2016 +0100
tree 7a78a2b19b0847281f8cf69af735b30b15732fa8
parent 1fd347303275a424d114c9833f954e8e27812554

Fixes to build against new VIXL interface.

- Fix namespace usage and use of deprecated functions.
- Link all dependants to new libvixl-arm64 target for now.

Change-Id: Iee6f299784fd663fc2a759f3ee816fdbc511e509

compiler/Android.mk

diff --git a/compiler/Android.mk b/compiler/Android.mk
index 02c176c..b712add 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -280,15 +280,15 @@
   # Vixl assembly support for ARM64 targets.
   ifeq ($$(art_ndebug_or_debug),debug)
     ifeq ($$(art_static_or_shared), static)
-      LOCAL_WHOLESTATIC_LIBRARIES += libvixl
+      LOCAL_WHOLESTATIC_LIBRARIES += libvixl-arm64
     else
-      LOCAL_SHARED_LIBRARIES += libvixl
+      LOCAL_SHARED_LIBRARIES += libvixl-arm64
     endif
   else
     ifeq ($$(art_static_or_shared), static)
-      LOCAL_WHOLE_STATIC_LIBRARIES += libvixl
+      LOCAL_WHOLE_STATIC_LIBRARIES += libvixl-arm64
     else
-      LOCAL_SHARED_LIBRARIES += libvixl
+      LOCAL_SHARED_LIBRARIES += libvixl-arm64
     endif
   endif