Various small fixes for Linux build
* add "-latomic" which was missing since we moved to clang
* empty LOG_EVENT_INT stub added for Linux
* add link libraries to fix stack_unittest
* add missing headers
Test: build with ninja
Change-Id: I1fe0b0b615db1da5ad083c162cb207b08979ce15
diff --git a/main/BUILD.gn b/main/BUILD.gn
index d41f5a3..957068c 100644
--- a/main/BUILD.gn
+++ b/main/BUILD.gn
@@ -81,5 +81,6 @@
"-lresolv",
"-lrt",
"-lz",
+ "-latomic",
]
}
diff --git a/osi/include/log.h b/osi/include/log.h
index 9f0f821..d42ea62 100644
--- a/osi/include/log.h
+++ b/osi/include/log.h
@@ -36,6 +36,8 @@
#define LOG_WARN(...) LOGWRAPPER(__VA_ARGS__)
#define LOG_ERROR(...) LOGWRAPPER(__VA_ARGS__)
+#define LOG_EVENT_INT(...)
+
#else /* !defined(OS_GENERIC) */
#include <log/log.h>
diff --git a/stack/BUILD.gn b/stack/BUILD.gn
index ece0632..c5622b7 100644
--- a/stack/BUILD.gn
+++ b/stack/BUILD.gn
@@ -198,6 +198,15 @@
"//vnd/include"
]
+ libs = [
+ "-ldl",
+ "-lpthread",
+ "-lresolv",
+ "-lrt",
+ "-lz",
+ "-latomic",
+ ]
+
deps = [
":stack",
"//osi",
diff --git a/test/suite/BUILD.gn b/test/suite/BUILD.gn
index 3cd3bd7..e413eb0 100644
--- a/test/suite/BUILD.gn
+++ b/test/suite/BUILD.gn
@@ -40,5 +40,6 @@
"-lpthread",
"-lrt",
"-ldl",
+ "-latomic",
]
}
diff --git a/vendor_libs/test_vendor_lib/BUILD.gn b/vendor_libs/test_vendor_lib/BUILD.gn
index 2d5ec39..ad42c28 100644
--- a/vendor_libs/test_vendor_lib/BUILD.gn
+++ b/vendor_libs/test_vendor_lib/BUILD.gn
@@ -1,6 +1,7 @@
shared_library("test_vendor_lib") {
sources = [
"src/async_manager.cc",
+ "src/bt_address.cc",
"src/bt_vendor.cc",
"src/command_packet.cc",
"src/dual_mode_controller.cc",
@@ -57,5 +58,6 @@
"-lpthread",
"-lrt",
"-ldl",
+ "-latomic",
]
}
diff --git a/vendor_libs/test_vendor_lib/include/bt_address.h b/vendor_libs/test_vendor_lib/include/bt_address.h
index bb27731..e6eef59 100644
--- a/vendor_libs/test_vendor_lib/include/bt_address.h
+++ b/vendor_libs/test_vendor_lib/include/bt_address.h
@@ -18,6 +18,7 @@
#include <cstdint>
#include <vector>
+#include <string>
namespace test_vendor_lib {
diff --git a/vendor_libs/test_vendor_lib/src/async_manager.cc b/vendor_libs/test_vendor_lib/src/async_manager.cc
index 5c530ca..076eab3 100644
--- a/vendor_libs/test_vendor_lib/src/async_manager.cc
+++ b/vendor_libs/test_vendor_lib/src/async_manager.cc
@@ -20,6 +20,7 @@
#include <algorithm>
#include <atomic>
+#include <condition_variable>
#include <mutex>
#include <thread>
#include <vector>
diff --git a/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc b/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc
index e91790a..6389034 100644
--- a/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc
+++ b/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc
@@ -19,6 +19,7 @@
#include "async_manager.h"
+#include <condition_variable>
#include <gtest/gtest.h>
#include <functional>
#include <mutex>