6 files changed, 2 insertions, 23 deletions
diff --git a/tools/rootcanal/Android.bp b/tools/rootcanal/Android.bp
index c5e3483bba..188f425bd0 100644
--- a/tools/rootcanal/Android.bp
+++ b/tools/rootcanal/Android.bp
@@ -48,7 +48,6 @@ cc_defaults {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/tools/rootcanal/include",
-        "packages/modules/Bluetooth/system/gd",
     ],
     header_libs: [
         "libbase_headers",
diff --git a/system/test/rootcanal/Android.bp b/tools/rootcanal/hal/Android.bp
index 6e8e1e9f8d..f211b70b9c 100644
--- a/system/test/rootcanal/Android.bp
+++ b/tools/rootcanal/hal/Android.bp
@@ -24,9 +24,7 @@ package {
 
 cc_binary {
     name: "android.hardware.bluetooth@1.1-service.sim",
-    defaults: [
-        "gd_defaults",
-    ],
+    defaults: ["rootcanal_defaults"],
     proprietary: true,
     relative_install_path: "hw",
     srcs: [
@@ -36,7 +34,6 @@ cc_binary {
     visibility: [
         "//platform_testing/libraries/sts-common-util/host-side/rootcanal",
     ],
-    header_libs: ["libbluetooth_headers"],
     shared_libs: [
         "android.hardware.bluetooth@1.0",
         "android.hardware.bluetooth@1.1",
@@ -59,21 +56,12 @@ cc_binary {
         "android.hardware.bluetooth-hci",
         "libscriptedbeaconpayload-protos-lite",
     ],
-    include_dirs: [
-        "packages/modules/Bluetooth/tools/rootcanal/include",
-        "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
-        "packages/modules/Bluetooth/system/stack/include",
-    ],
     init_rc: ["android.hardware.bluetooth@1.1-service.sim.rc"],
 }
 
 cc_library_shared {
     name: "android.hardware.bluetooth@1.1-impl-sim",
-    defaults: [
-        "gd_defaults",
-    ],
+    defaults: ["rootcanal_defaults"],
     proprietary: true,
     relative_install_path: "hw",
     srcs: [
@@ -82,7 +70,6 @@ cc_library_shared {
     visibility: [
         "//platform_testing/libraries/sts-common-util/host-side/rootcanal",
     ],
-    header_libs: ["libbluetooth_headers"],
     shared_libs: [
         "android.hardware.bluetooth@1.0",
         "android.hardware.bluetooth@1.1",
@@ -102,11 +89,4 @@ cc_library_shared {
         "android.hardware.bluetooth-hci",
         "libscriptedbeaconpayload-protos-lite",
     ],
-    include_dirs: [
-        "packages/modules/Bluetooth/tools/rootcanal/include",
-        "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/internal_include",
-        "packages/modules/Bluetooth/system/stack/include",
-    ],
 }
diff --git a/system/test/rootcanal/android.hardware.bluetooth@1.1-service.sim.rc b/tools/rootcanal/hal/android.hardware.bluetooth@1.1-service.sim.rc
index 262684136e..262684136e 100644
--- a/system/test/rootcanal/android.hardware.bluetooth@1.1-service.sim.rc
+++ b/tools/rootcanal/hal/android.hardware.bluetooth@1.1-service.sim.rc
diff --git a/system/test/rootcanal/bluetooth_hci.cc b/tools/rootcanal/hal/bluetooth_hci.cc
index bab7be1139..bab7be1139 100644
--- a/system/test/rootcanal/bluetooth_hci.cc
+++ b/tools/rootcanal/hal/bluetooth_hci.cc
diff --git a/system/test/rootcanal/bluetooth_hci.h b/tools/rootcanal/hal/bluetooth_hci.h
index 1bceda8812..1bceda8812 100644
--- a/system/test/rootcanal/bluetooth_hci.h
+++ b/tools/rootcanal/hal/bluetooth_hci.h
diff --git a/system/test/rootcanal/service.cc b/tools/rootcanal/hal/service.cc
index 7856dcfa5b..7856dcfa5b 100644
--- a/system/test/rootcanal/service.cc
+++ b/tools/rootcanal/hal/service.cc