summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 586fd64)
raw | patch | inline | side by side (parent: 586fd64)
author | Steven Moreland <smoreland@google.com> | |
Tue, 11 Apr 2017 19:22:27 +0000 (12:22 -0700) | ||
committer | Steven Moreland <smoreland@google.com> | |
Wed, 12 Apr 2017 17:12:44 +0000 (10:12 -0700) |
Helper libraries also now on vendor partition.
Test: links
Test: bluetooth works on internal Marlin
Bug: 33241851
(cherry picked from commit 96510c80f84e192f106678d269e793ade8510b1c)
Merged-In: Ie99faf9146ce2ce3df83a2b46acfaa36a54c16c2
Change-Id: Ie99faf9146ce2ce3df83a2b46acfaa36a54c16c2
Test: links
Test: bluetooth works on internal Marlin
Bug: 33241851
(cherry picked from commit 96510c80f84e192f106678d269e793ade8510b1c)
Merged-In: Ie99faf9146ce2ce3df83a2b46acfaa36a54c16c2
Change-Id: Ie99faf9146ce2ce3df83a2b46acfaa36a54c16c2
index 292f97c51ad569e6239fd7871808a7dbc237bb55..c77f0e6b80f9a4b79986a6291155253a53e1841a 100644 (file)
cc_library_static {
name: "android.hardware.bluetooth-async",
+ proprietary: true,
defaults: ["hidl_defaults"],
srcs: [
"async_fd_watcher.cc",
],
export_include_dirs: ["."],
shared_libs: [
- "libbase",
- "libcutils",
"liblog",
- "libutils",
],
}
cc_library_static {
name: "android.hardware.bluetooth-hci",
+ proprietary: true,
defaults: ["hidl_defaults"],
srcs: [
"hci_packetizer.cc",
export_include_dirs: ["."],
shared_libs: [
"libbase",
- "libcutils",
"libhidlbase",
"liblog",
"libutils",
index 8eccfc7441cc7744e08ea7546792fe4329b15d1f..e14e3d70428d2009fb15f9cbce5e5f2b6a2d006a 100644 (file)
#define LOG_TAG "android.hardware.bluetooth@1.0-impl"
#include "bluetooth_hci.h"
-#include <utils/Log.h>
+#include <log/log.h>
#include "vendor_interface.h"
index bb1e36ba53a1ebaab43d893c5ea30c4c66b745a5..a208da16df093b6c84289f07cad5d9b43902766c 100644 (file)
#include "hci_protocol.h"
#define LOG_TAG "android.hardware.bluetooth-hci-hci_protocol"
-#include <android-base/logging.h>
#include <assert.h>
#include <fcntl.h>
-#include <utils/Log.h>
+#include <log/log.h>
namespace android {
namespace hardware {
diff --git a/bluetooth/1.0/default/test/async_fd_watcher_unittest.cc b/bluetooth/1.0/default/test/async_fd_watcher_unittest.cc
index b0c533c9a5e65292828bc015238d9e15cdd5a260..dfc50a35cc49e011e0c23bf33988b70a47f0d73d 100644 (file)
#include <cstring>
#include <vector>
+#include <log/log.h>
#include <netdb.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
-#include <utils/Log.h>
namespace android {
namespace hardware {
diff --git a/bluetooth/1.0/default/test/h4_protocol_unittest.cc b/bluetooth/1.0/default/test/h4_protocol_unittest.cc
index d53aaa9facbac193653218d7923935e220f082f5..ad08086c7ea4c193e97a8c206ea4deb6ebbed703 100644 (file)
#include <mutex>
#include <vector>
+#include <log/log.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
-#include <utils/Log.h>
namespace android {
namespace hardware {
diff --git a/bluetooth/1.0/default/test/mct_protocol_unittest.cc b/bluetooth/1.0/default/test/mct_protocol_unittest.cc
index 0a6e9ebc4a88ca97dc8ce24e888ea0edd167ec9e..d45058e22c42af620fe0d364bb553f8adb444717 100644 (file)
#include <mutex>
#include <vector>
+#include <log/log.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
-#include <utils/Log.h>
namespace android {
namespace hardware {
index ad5c1945d2ab4f852fed2dc707dc6a541399ef8a..6ac4fb42712845d795f5d76c616626232c8eb008 100644 (file)
#include <unistd.h>
#include <cutils/properties.h>
-#include <utils/Log.h>
+#include <log/log.h>
static const int MAX_PROPERTIES = 5;