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

disassembler/Android.mk

diff --git a/disassembler/Android.mk b/disassembler/Android.mk
index d76bbb8..6905f88 100644
--- a/disassembler/Android.mk
+++ b/disassembler/Android.mk
@@ -91,9 +91,9 @@
   LOCAL_NATIVE_COVERAGE := $(ART_COVERAGE)
   # For disassembler_arm64.
   ifeq ($$(art_ndebug_or_debug),debug)
-     LOCAL_SHARED_LIBRARIES += libvixl
+     LOCAL_SHARED_LIBRARIES += libvixl-arm64
   else
-     LOCAL_SHARED_LIBRARIES += libvixl
+     LOCAL_SHARED_LIBRARIES += libvixl-arm64
   endif
   ifeq ($$(art_target_or_host),target)
     include $(BUILD_SHARED_LIBRARY)