commit 12dd9aee74a588bf31f151cebba930849b4baceb
author Roland Levillain <rpl@google.com> Tue Nov 06 13:32:06 2018 +0000
committer Roland Levillain <rpl@google.com> Tue Nov 06 14:31:16 2018 +0000
tree 9d04404a17b4f3e5e9e2b1150fc575a74ecd37c2
parent 5725e7c4aab576384649de60557dc1f52eb21b9f

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

diff --git a/disassembler/Android.bp b/disassembler/Android.bp
index a7c1802..5aa159e 100644
--- a/disassembler/Android.bp
+++ b/disassembler/Android.bp
@@ -69,8 +69,7 @@
     defaults: ["libart-disassembler-defaults"],
     shared_libs: [
         // For disassembler_arm*.
-        "libvixl-arm",
-        "libvixl-arm64",
+        "libvixl",
     ],
 }
 
@@ -82,7 +81,6 @@
     ],
     shared_libs: [
         // For disassembler_arm*.
-        "libvixld-arm",
-        "libvixld-arm64",
+        "libvixld",
     ],
 }