Revert "Build dex2oatd with compile_multilib: both."
This reverts commit 81141ac9826075fa10f10674015f114e1210da7a.
Reason for revert: breaks linux-bionic targets
Test: none
Bug: 122373634
Change-Id: I95300f3c73a6c102abe5c0f66c5a8deed52cfd12
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 6a4a88e..3a2ae75 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -308,20 +308,8 @@
shared_libs: [
"libz",
],
- compile_multilib: "both",
},
},
-
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
-
- symlink_preferred_arch: true,
}
cc_defaults {