Include early_virtmgr only to 64bit builds
Test: build with 16k targets
Change-Id: I31d9eb83324a29b391231c6af0c9904df4ed3973
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 7a3ec8a..0a2b2de 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -81,6 +81,9 @@
}) + select(release_flag("RELEASE_AVF_ENABLE_NETWORK"), {
true: ["vmnic"],
default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_EARLY_VM"), {
+ true: ["early_virtmgr"],
+ default: [],
}),
filesystems: microdroid_filesystem_images,
prebuilts: [
@@ -98,6 +101,9 @@
}) + select(release_flag("RELEASE_AVF_ENABLE_NETWORK"), {
true: ["vmnic"],
default: [],
+ }) + select(release_flag("RELEASE_AVF_ENABLE_EARLY_VM"), {
+ true: ["early_virtmgr"],
+ default: [],
}),
filesystems: microdroid_filesystem_images,
},
@@ -105,10 +111,7 @@
binaries: [
"fd_server",
"vm",
- ] + select(release_flag("RELEASE_AVF_ENABLE_EARLY_VM"), {
- true: ["early_virtmgr"],
- default: [],
- }),
+ ],
prebuilts: [
"features_com.android.virt.xml",
"microdroid_initrd_debuggable",