Build dex2oatd with compile_multilib: both.
We hit a bug where the output of dex2oat could depend on the binary's
isa. Build dex2oatd with both 32 and 64 bit versions to enable us to
more easily test for this in the future.
Test: m dex2oatd
Bug: 122373634
Change-Id: I2d36b0151e2f3393308ca22b1e06f4015fa60b76
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 3a2ae75..6a4a88e 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -308,8 +308,20 @@
shared_libs: [
"libz",
],
+ compile_multilib: "both",
},
},
+
+ multilib: {
+ lib32: {
+ suffix: "32",
+ },
+ lib64: {
+ suffix: "64",
+ },
+ },
+
+ symlink_preferred_arch: true,
}
cc_defaults {