summaryrefslogtreecommitdiffstats
path: root/oatdump
diff options
context:
space:
mode:
authorRoland Levillain <rpl@google.com>2018-11-06 13:32:06 +0000
committerRoland Levillain <rpl@google.com>2018-11-06 14:31:16 +0000
commit12dd9aee74a588bf31f151cebba930849b4baceb (patch)
tree9d04404a17b4f3e5e9e2b1150fc575a74ecd37c2 /oatdump
parent5725e7c4aab576384649de60557dc1f52eb21b9f (diff)
downloadart-12dd9aee74a588bf31f151cebba930849b4baceb.tar.gz
art-12dd9aee74a588bf31f151cebba930849b4baceb.tar.bz2
art-12dd9aee74a588bf31f151cebba930849b4baceb.zip
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
Diffstat (limited to 'oatdump')
-rw-r--r--oatdump/Android.bp6
1 files changed, 2 insertions, 4 deletions
diff --git a/oatdump/Android.bp b/oatdump/Android.bp
index 596a94664d..45f853b06e 100644
--- a/oatdump/Android.bp
+++ b/oatdump/Android.bp
@@ -100,8 +100,7 @@ art_cc_binary {
],
static_libs: [
"libart-disassembler",
- "libvixl-arm",
- "libvixl-arm64",
+ "libvixl",
],
}
@@ -124,8 +123,7 @@ art_cc_binary {
},
static_libs: [
"libartd-disassembler",
- "libvixld-arm",
- "libvixld-arm64",
+ "libvixld",
],
group_static_libs: true,
}