diff --git a/vendor_libs/BUILD.gn b/vendor_libs/BUILD.gn
index 2a12558..a088315 100644
--- a/vendor_libs/BUILD.gn
+++ b/vendor_libs/BUILD.gn
@@ -17,7 +17,6 @@
 group("vendor-libs") {
   deps = [
     "linux:bt-vendor-linux",
-    #TODO(jpawlowski): uncomment when building fixed
-    #    "test_vendor_lib:test_vendor_lib",
+    "test_vendor_lib:test_vendor_lib",
   ]
 }
diff --git a/vendor_libs/test_vendor_lib/BUILD.gn b/vendor_libs/test_vendor_lib/BUILD.gn
index 76f4651..909e68e 100644
--- a/vendor_libs/test_vendor_lib/BUILD.gn
+++ b/vendor_libs/test_vendor_lib/BUILD.gn
@@ -18,7 +18,10 @@
     # TODO(dennischeng): Ideally we should need to have the lines below for
     # indirect includes.
     "//stack/include",
-    "//third_party/libchrome:base",
+  ]
+
+  deps = [
+    "//third_party/libchrome:base"
   ]
 }
 
@@ -27,6 +30,7 @@
   sources = [
     "src/command_packet.cc",
     "src/event_packet.cc",
+    "src/hci_transport.cc",
     "src/packet.cc",
     "src/packet_stream.cc",
     "test/hci_transport_unittest.cc",
diff --git a/vendor_libs/test_vendor_lib/src/test_channel_transport.cc b/vendor_libs/test_vendor_lib/src/test_channel_transport.cc
index 45362ff..e869d1b 100644
--- a/vendor_libs/test_vendor_lib/src/test_channel_transport.cc
+++ b/vendor_libs/test_vendor_lib/src/test_channel_transport.cc
@@ -37,7 +37,7 @@
   CHECK(enabled_);
 
   struct sockaddr_in listen_address, test_channel_address;
-  int sockaddr_in_size = sizeof(struct sockaddr_in);
+  socklen_t sockaddr_in_size = sizeof(struct sockaddr_in);
   int listen_fd = -1;
   int accept_fd = -1;
   memset(&listen_address, 0, sockaddr_in_size);