Merge "cf arm64 uses root-canal in the host as well"
diff --git a/build/Android.bp b/build/Android.bp
index 8223218..416848e 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -61,6 +61,7 @@
"newfs_msdos",
"powerwash_cvd",
"restart_cvd",
+ "root-canal",
"run_cvd",
"secure_env",
"socket_vsock_proxy",
@@ -73,11 +74,6 @@
"webrtc_operator",
]
-// TODO(b/181203470): Support root-canal for arm64 Host
-cvd_host_tools_x86_64 = [
- "root-canal",
-]
-
cvd_host_tests = [
"cuttlefish_net_tests",
"modem_simulator_test",
@@ -163,7 +159,6 @@
deps: cvd_host_seccomp_policy_x86_64,
},
},
- deps: cvd_host_tools_x86_64,
},
arm64: {
multilib: {
diff --git a/host/libs/config/cuttlefish_config.cpp b/host/libs/config/cuttlefish_config.cpp
index bdf9fbc..92388c4 100644
--- a/host/libs/config/cuttlefish_config.cpp
+++ b/host/libs/config/cuttlefish_config.cpp
@@ -608,12 +608,7 @@
(*dictionary_)[kenableHostBluetooth] = enable_host_bluetooth;
}
bool CuttlefishConfig::enable_host_bluetooth() const {
-// TODO(b/181203470): Support root-canal for arm64 Host
-#if defined(__BIONIC__)
- return false;
-#else
return (*dictionary_)[kenableHostBluetooth].asBool();
-#endif
}
static constexpr char kEnableMetrics[] = "enable_metrics";
diff --git a/shared/device.mk b/shared/device.mk
index 8f43661..8fe44f0 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -39,12 +39,8 @@
TARGET_USERDATAIMAGE_PARTITION_SIZE ?= 6442450944
TARGET_VULKAN_SUPPORT ?= true
-# TODO(b/181203470) enable it for every target when rootcanal supports arm64 as well.
-# Depends on TARGET_PRODUCT because TARGET_ARCH is not available here.
-ifneq ($(findstring x86,$(TARGET_PRODUCT)),)
TARGET_ENABLE_HOST_BLUETOOTH_EMULATION ?= true
TARGET_USE_BTLINUX_HAL_IMPL ?= true
-endif
AB_OTA_UPDATER := true
AB_OTA_PARTITIONS += \