Merge "authfs: don't use crosvm_defaults" into main am: 69e4860127
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3488192
Change-Id: Id1a3c51b65d0e79f5d86c5d207ec67df01a7365a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/guest/authfs/Android.bp b/guest/authfs/Android.bp
index 28e0f4a..6c229b6 100644
--- a/guest/authfs/Android.bp
+++ b/guest/authfs/Android.bp
@@ -26,13 +26,12 @@
"libthiserror",
],
prefer_rlib: true,
- target: {
- darwin: {
+ multilib: {
+ lib32: {
enabled: false,
},
},
defaults: [
- "crosvm_defaults",
"avf_build_flags_rust",
],
}
@@ -47,8 +46,4 @@
rust_binary {
name: "authfs",
defaults: ["authfs_defaults"],
- // //apex_available:platform is necessary here to counteract the
- // com.android.virt in crosvm_defaults and make authfs available
- // to the platform so it can be embedded in the microdroid image.
- apex_available: ["//apex_available:platform"],
}