commit cffbbfc58793812f584a70428652f765cbaf845d
author Jeongik Cha <jeongik@google.com> Fri Nov 17 22:17:06 2023 +0900
committer Jeongik Cha <jeongik@google.com> Wed Nov 22 04:59:36 2023 +0000
tree a510e8d7495f8bfd4001bbf69c30cc845cc6456a
parent aa35698e1674edeca183d711bebaba4599c70b6e

Turn on vhost-user-vsock for arm64 by default

Test: adb
Bug: 277909042
Change-Id: I7c3d871923a042fe477f762ea2151527dc655350

Android.bp

diff --git a/Android.bp b/Android.bp
index bcd93c9..38d1b05 100644
--- a/Android.bp
+++ b/Android.bp
@@ -91,7 +91,7 @@
     name: "cf_cc_defaults",
     module_type: "cc_defaults",
     config_namespace: "cvdhost",
-    bool_variables: ["enforce_mac80211_hwsim"],
+    bool_variables: ["enforce_mac80211_hwsim", "vhost_user_vsock_by_default"],
     properties: ["cflags"],
 }
 
@@ -106,6 +106,12 @@
                 cflags: [],
             }
         },
+        vhost_user_vsock_by_default: {
+            cflags: ["-DVHOST_USER_VSOCK_BY_DEFAULT=true"],
+            conditions_default: {
+                cflags: [],
+            }
+        }
     }
 }
 // Defaults for cuttlefish modules that are available only in the guest OS (i.e. cuttlefish running

host/commands/assemble_cvd/flags_defaults.h

diff --git a/host/commands/assemble_cvd/flags_defaults.h b/host/commands/assemble_cvd/flags_defaults.h
index 243450e..d19beaf 100644
--- a/host/commands/assemble_cvd/flags_defaults.h
+++ b/host/commands/assemble_cvd/flags_defaults.h
@@ -42,7 +42,11 @@
 #define CF_DEFAULTS_DAEMON true
 #define CF_DEFAULTS_VM_MANAGER CF_DEFAULTS_DYNAMIC_STRING
 #define CF_DEFAULTS_VSOCK_GUEST_CID cuttlefish::GetDefaultVsockCid()
+#ifdef VHOST_USER_VSOCK_BY_DEFAULT
+#define CF_DEFAULTS_VHOST_USER_VSOCK true
+#else
 #define CF_DEFAULTS_VHOST_USER_VSOCK false
+#endif  // VHOST_USER_VSOCK_BY_DEFAULT
 #define CF_DEFAULTS_ENABLE_MINIMAL_MODE false
 #define CF_DEFAULTS_RESTART_SUBPROCESSES false
 #define CF_DEFAULTS_SETUPWIZARD_MODE "DISABLED"

shared/BoardConfig.mk

diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index d0206ec..6ab9405 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -427,3 +427,7 @@
 ifneq ($(PRODUCT_BUILD_VBMETA_IMAGE), false)
 AB_OTA_PARTITIONS += vbmeta
 endif
+
+ifeq ($(TARGET_ARCH),arm64)
+$(call soong_config_append,cvdhost,vhost_user_vsock_by_default,true)
+endif
\ No newline at end of file