commit f0b58c1fcf8491c4b3ce157ee03ed7e5873b2b4e
author Cole Faust <colefaust@google.com> Thu Oct 24 01:46:49 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 24 01:46:49 2024 +0000
tree 13bdfdb43fe616c82a8acaf6dadd199d0d8d7a9e
parent a52dac6447aa382a9b5b6f5934229cef4fa08b04
parent 2b94409adc74d01ff74561c7723ab1231346d7ad

Remove dependencies on the 1-variant fallback am: 2b94409adc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3317706

Change-Id: Ibcee399ff8ec4fcaf0b7a93249534414f08bfcd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

build/microdroid/Android.bp

diff --git a/build/microdroid/Android.bp b/build/microdroid/Android.bp
index cacf356..abb97da 100644
--- a/build/microdroid/Android.bp
+++ b/build/microdroid/Android.bp
@@ -597,6 +597,7 @@
 // HACK: use cc_genrule for arch-specific properties
 cc_genrule {
     name: "microdroid_kernel_hashes_rs",
+    compile_multilib: "first",
     srcs: [":microdroid_kernel"],
     arch: {
         arm64: {
@@ -621,6 +622,7 @@
 
 rust_library_rlib {
     name: "libmicrodroid_kernel_hashes",
+    compile_multilib: "first",
     srcs: [":microdroid_kernel_hashes_rs"],
     crate_name: "microdroid_kernel_hashes",
     prefer_rlib: true,

libs/libservice_vm_fake_chain/Android.bp

diff --git a/libs/libservice_vm_fake_chain/Android.bp b/libs/libservice_vm_fake_chain/Android.bp
index 39f36eb..56fb22a 100644
--- a/libs/libservice_vm_fake_chain/Android.bp
+++ b/libs/libservice_vm_fake_chain/Android.bp
@@ -18,6 +18,7 @@
 
 rust_defaults {
     name: "libservice_vm_fake_chain_defaults",
+    compile_multilib: "first",
     crate_name: "service_vm_fake_chain",
     defaults: ["avf_build_flags_rust"],
     srcs: ["src/lib.rs"],

libs/libservice_vm_requests/Android.bp

diff --git a/libs/libservice_vm_requests/Android.bp b/libs/libservice_vm_requests/Android.bp
index 57da012..d87b087 100644
--- a/libs/libservice_vm_requests/Android.bp
+++ b/libs/libservice_vm_requests/Android.bp
@@ -4,6 +4,7 @@
 
 rust_defaults {
     name: "libservice_vm_requests_nostd_defaults",
+    compile_multilib: "first",
     crate_name: "service_vm_requests",
     defaults: ["avf_build_flags_rust"],
     srcs: ["src/lib.rs"],