2 files changed, 16 insertions, 5 deletions
diff --git a/build.py b/build.py
index d7c1f65f40..388ec46a13 100755
--- a/build.py
+++ b/build.py
@@ -44,17 +44,21 @@ COMMON_MK_USES = [
     'coverage',
     'cros_host',
     'cros_debug',
+    'floss_rootcanal',
+    'function_elimination_experiment',
     'fuzzer',
     'fuzzer',
+    'lto_experiment',
     'msan',
     'profiling',
+    'proto_force_optimize_speed',
     'tcmalloc',
     'test',
     'ubsan',
 ]
 
 # Use a specific commit version for common-mk to avoid build surprises.
-COMMON_MK_COMMIT = "136c3e114b65f2c6c5f026376c2e75c73c2478a3"
+COMMON_MK_COMMIT = "d014d561eaf5ece08166edd98b10c145ef81312d"
 
 # Default use flags.
 USE_DEFAULTS = {
diff --git a/system/gd/hal/BUILD.gn b/system/gd/hal/BUILD.gn
index fa9f3a64f6..29dac1ad5b 100644
--- a/system/gd/hal/BUILD.gn
+++ b/system/gd/hal/BUILD.gn
@@ -27,10 +27,17 @@ source_set("BluetoothHalSources") {
 }
 
 source_set("BluetoothHalSources_hci_host") {
-  sources = [
-    "hci_hal_host.cc",
-    "mgmt.cc",
-  ]
+  if (use.floss_rootcanal) {
+    sources = [
+      "hci_hal_host_rootcanal.cc",
+      "mgmt.cc",
+    ]
+  } else {
+    sources = [
+      "hci_hal_host.cc",
+      "mgmt.cc",
+    ]
+  }
 
   configs += [ "//bt/system/gd:gd_defaults" ]
   deps = [ "//bt/system/gd:gd_default_deps" ]