From 12dd9aee74a588bf31f151cebba930849b4baceb Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Tue, 6 Nov 2018 13:32:06 +0000 Subject: Use unified libvixl(d) instead of per-supported-arch libvixl(d)-arm(64). Using a unified libvixl(s) saves space by sharing code that was common to libvixl(d)-arm and libvixl(d)-arm64 and also addresses multiple definitions issues that would cause ODR violations. Test: 32-bit-only device boot test Test: 32/64-bit device boot test Change-Id: I1d67c43897e08bc0f5743eb038fe574ce2fb54f3 --- disassembler/Android.bp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'disassembler') diff --git a/disassembler/Android.bp b/disassembler/Android.bp index a7c1802515..5aa159e98b 100644 --- a/disassembler/Android.bp +++ b/disassembler/Android.bp @@ -69,8 +69,7 @@ art_cc_library { defaults: ["libart-disassembler-defaults"], shared_libs: [ // For disassembler_arm*. - "libvixl-arm", - "libvixl-arm64", + "libvixl", ], } @@ -82,7 +81,6 @@ art_cc_library { ], shared_libs: [ // For disassembler_arm*. - "libvixld-arm", - "libvixld-arm64", + "libvixld", ], } -- cgit v1.2.3-59-g8ed1b