diff --git a/system/bta/BUILD.gn b/system/bta/BUILD.gn
index ff477f0141808eb789c12da3254b123e02b56e6b..56a759707341edbf989a339f495c6cb31e5ad456 100644
--- a/system/bta/BUILD.gn
+++ b/system/bta/BUILD.gn
@@ -64,7 +64,6 @@ static_library("bta") {
     "hh/bta_hh_le.cc",
     "hh/bta_hh_main.cc",
     "hh/bta_hh_utils.cc",
-    "hd/bta_hd_utils.cc",
     "hd/bta_hd_act.cc",
     "hd/bta_hd_api.cc",
     "hd/bta_hd_main.cc",
diff --git a/system/stack/BUILD.gn b/system/stack/BUILD.gn
index 435b38fca0769ece8278f36e2bde5c465e91f6e3..371f0169f6c7194f0d58da7099b7de12cf6827b3 100644
--- a/system/stack/BUILD.gn
+++ b/system/stack/BUILD.gn
@@ -17,10 +17,17 @@
 static_library("stack") {
   sources = [
     "a2dp/a2dp_api.cc",
+    "a2dp/a2dp_codec_config.cc",
     "a2dp/a2dp_sbc.cc",
     "a2dp/a2dp_sbc_encoder.cc",
     "a2dp/a2dp_sbc_up_sample.cc",
     "a2dp/a2dp_vendor.cc",
+    "a2dp/a2dp_vendor_aptx.cc",
+    "a2dp/a2dp_vendor_aptx_encoder.cc",
+    "a2dp/a2dp_vendor_aptx_hd.cc",
+    "a2dp/a2dp_vendor_aptx_hd_encoder.cc",
+    "a2dp/a2dp_vendor_ldac.cc",
+    "a2dp/a2dp_vendor_ldac_encoder.cc",
     "avct/avct_api.cc",
     "avct/avct_bcb_act.cc",
     "avct/avct_ccb.cc",
@@ -213,6 +220,7 @@ executable("stack_unittests") {
     "//osi",
     "//btcore",
     "//device",
+    "//embdrv/sbc",
     "//hci",
     "//main:bluetooth.default",
     "//third_party/googletest:gmock_main",