test_vendor: Remove unused extern statements
It should be safe to include C header files without
using extern.
Change-Id: I2b562ef3f76df9f9dac69323345ed3d3610e8bc2
Signed-off-by: Myles Watson <mylesgw@google.com>
diff --git a/system/vendor_libs/test_vendor_lib/include/packet.h b/system/vendor_libs/test_vendor_lib/include/packet.h
index 4636dd8..45bb6e7 100644
--- a/system/vendor_libs/test_vendor_lib/include/packet.h
+++ b/system/vendor_libs/test_vendor_lib/include/packet.h
@@ -20,9 +20,7 @@
#include <vector>
using std::vector;
-extern "C" {
#include "hci/include/hci_hal.h"
-} // extern "C"
namespace test_vendor_lib {
diff --git a/system/vendor_libs/test_vendor_lib/src/command_packet.cc b/system/vendor_libs/test_vendor_lib/src/command_packet.cc
index 8704f5a..1127e1d 100644
--- a/system/vendor_libs/test_vendor_lib/src/command_packet.cc
+++ b/system/vendor_libs/test_vendor_lib/src/command_packet.cc
@@ -18,11 +18,9 @@
#include "command_packet.h"
-extern "C" {
#include "hci/include/hci_hal.h"
#include "osi/include/log.h"
#include "stack/include/hcidefs.h"
-} // extern "C"
namespace test_vendor_lib {
diff --git a/system/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc b/system/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
index f9fea2c..ce09846 100644
--- a/system/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
+++ b/system/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
@@ -27,11 +27,9 @@
#include "event_packet.h"
#include "hci_transport.h"
-extern "C" {
#include "osi/include/log.h"
#include "osi/include/osi.h"
#include "stack/include/hcidefs.h"
-} // extern "C"
namespace {
diff --git a/system/vendor_libs/test_vendor_lib/src/event_packet.cc b/system/vendor_libs/test_vendor_lib/src/event_packet.cc
index 02a3253..3a353f8 100644
--- a/system/vendor_libs/test_vendor_lib/src/event_packet.cc
+++ b/system/vendor_libs/test_vendor_lib/src/event_packet.cc
@@ -18,10 +18,8 @@
#include "event_packet.h"
-extern "C" {
#include "osi/include/log.h"
#include "stack/include/hcidefs.h"
-} // extern "C"
namespace test_vendor_lib {
diff --git a/system/vendor_libs/test_vendor_lib/src/packet.cc b/system/vendor_libs/test_vendor_lib/src/packet.cc
index f119edd..c6789c9 100644
--- a/system/vendor_libs/test_vendor_lib/src/packet.cc
+++ b/system/vendor_libs/test_vendor_lib/src/packet.cc
@@ -18,13 +18,10 @@
#include "packet.h"
-#include "base/logging.h"
-
#include <algorithm>
-extern "C" {
+#include "base/logging.h"
#include "osi/include/log.h"
-} // extern "C"
namespace test_vendor_lib {
diff --git a/system/vendor_libs/test_vendor_lib/src/packet_stream.cc b/system/vendor_libs/test_vendor_lib/src/packet_stream.cc
index 187d324..63d53c7 100644
--- a/system/vendor_libs/test_vendor_lib/src/packet_stream.cc
+++ b/system/vendor_libs/test_vendor_lib/src/packet_stream.cc
@@ -20,12 +20,10 @@
#include "base/logging.h"
-extern "C" {
#include <errno.h>
#include <unistd.h>
#include "osi/include/log.h"
-} // extern "C"
namespace test_vendor_lib {
diff --git a/system/vendor_libs/test_vendor_lib/src/test_channel_transport.cc b/system/vendor_libs/test_vendor_lib/src/test_channel_transport.cc
index e66783c..9b67eae 100644
--- a/system/vendor_libs/test_vendor_lib/src/test_channel_transport.cc
+++ b/system/vendor_libs/test_vendor_lib/src/test_channel_transport.cc
@@ -20,13 +20,11 @@
#include "base/logging.h"
-extern "C" {
#include "osi/include/log.h"
#include "osi/include/osi.h"
#include <netinet/in.h>
#include <sys/socket.h>
-} // extern "C"
namespace test_vendor_lib {
diff --git a/system/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc b/system/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc
index bd69030..144a19b 100644
--- a/system/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc
+++ b/system/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc
@@ -24,9 +24,7 @@
#include <mutex>
#include <thread>
-extern "C" {
#include "stack/include/hcidefs.h"
-} // extern "C"
namespace {
const vector<uint8_t> stub_command({DATA_TYPE_COMMAND,
diff --git a/system/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc b/system/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc
index bebf865..66e5126 100644
--- a/system/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc
+++ b/system/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc
@@ -25,12 +25,10 @@
#include <vector>
using std::vector;
-extern "C" {
#include "hci/include/hci_hal.h"
#include "stack/include/hcidefs.h"
#include <sys/socket.h>
-} // extern "C"
namespace {
const char small_payload[] = "foo bar baz";
