From: Jorge E. Moreira <jemoreira@google.com>
Date: Thu, 4 Aug 2016 23:46:45 +0000 (-0700)
Subject: Using include paths relative to vendor library dir
X-Git-Tag: android-x86-8.1-r1~196^2~67^2~174^2~281
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ea3ede2474a8980387b67bc7db2b661e7219b468;p=android-x86%2Fsystem-bt.git

Using include paths relative to vendor library dir

Change-Id: I6b5dfa4098cdf2eda21d3fae60729b765532c2f9
---

diff --git a/vendor_libs/test_vendor_lib/include/command_packet.h b/vendor_libs/test_vendor_lib/include/command_packet.h
index 0661e0b84..0eadc38e3 100644
--- a/vendor_libs/test_vendor_lib/include/command_packet.h
+++ b/vendor_libs/test_vendor_lib/include/command_packet.h
@@ -21,7 +21,7 @@
 using std::vector;
 
 #include "base/macros.h"
-#include "vendor_libs/test_vendor_lib/include/packet.h"
+#include "packet.h"
 
 namespace test_vendor_lib {
 
diff --git a/vendor_libs/test_vendor_lib/include/dual_mode_controller.h b/vendor_libs/test_vendor_lib/include/dual_mode_controller.h
index 96c6def8f..2a7646a15 100644
--- a/vendor_libs/test_vendor_lib/include/dual_mode_controller.h
+++ b/vendor_libs/test_vendor_lib/include/dual_mode_controller.h
@@ -25,9 +25,9 @@ using std::vector;
 
 #include "base/json/json_value_converter.h"
 #include "base/time/time.h"
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
-#include "vendor_libs/test_vendor_lib/include/hci_transport.h"
-#include "vendor_libs/test_vendor_lib/include/test_channel_transport.h"
+#include "command_packet.h"
+#include "hci_transport.h"
+#include "test_channel_transport.h"
 
 namespace test_vendor_lib {
 
diff --git a/vendor_libs/test_vendor_lib/include/event_packet.h b/vendor_libs/test_vendor_lib/include/event_packet.h
index b82cd8a9f..ee4272668 100644
--- a/vendor_libs/test_vendor_lib/include/event_packet.h
+++ b/vendor_libs/test_vendor_lib/include/event_packet.h
@@ -22,7 +22,7 @@
 using std::vector;
 
 #include "base/logging.h"
-#include "vendor_libs/test_vendor_lib/include/packet.h"
+#include "packet.h"
 
 namespace test_vendor_lib {
 
diff --git a/vendor_libs/test_vendor_lib/include/hci_transport.h b/vendor_libs/test_vendor_lib/include/hci_transport.h
index 4f41bbd2f..87dc17d15 100644
--- a/vendor_libs/test_vendor_lib/include/hci_transport.h
+++ b/vendor_libs/test_vendor_lib/include/hci_transport.h
@@ -28,10 +28,10 @@ extern "C" {
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
-#include "vendor_libs/test_vendor_lib/include/packet.h"
-#include "vendor_libs/test_vendor_lib/include/packet_stream.h"
+#include "command_packet.h"
+#include "event_packet.h"
+#include "packet.h"
+#include "packet_stream.h"
 
 namespace test_vendor_lib {
 
diff --git a/vendor_libs/test_vendor_lib/include/packet_stream.h b/vendor_libs/test_vendor_lib/include/packet_stream.h
index 4c2acdcf1..123e6df7d 100644
--- a/vendor_libs/test_vendor_lib/include/packet_stream.h
+++ b/vendor_libs/test_vendor_lib/include/packet_stream.h
@@ -21,9 +21,9 @@
 #include <vector>
 using std::vector;
 
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
-#include "vendor_libs/test_vendor_lib/include/packet.h"
+#include "command_packet.h"
+#include "event_packet.h"
+#include "packet.h"
 
 namespace test_vendor_lib {
 
diff --git a/vendor_libs/test_vendor_lib/include/vendor_manager.h b/vendor_libs/test_vendor_lib/include/vendor_manager.h
index 7190d5ec7..bb048ca81 100644
--- a/vendor_libs/test_vendor_lib/include/vendor_manager.h
+++ b/vendor_libs/test_vendor_lib/include/vendor_manager.h
@@ -18,11 +18,11 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
+#include "dual_mode_controller.h"
+#include "event_packet.h"
 #include "hci/include/bt_vendor_lib.h"
-#include "vendor_libs/test_vendor_lib/include/dual_mode_controller.h"
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
-#include "vendor_libs/test_vendor_lib/include/hci_transport.h"
-#include "vendor_libs/test_vendor_lib/include/test_channel_transport.h"
+#include "hci_transport.h"
+#include "test_channel_transport.h"
 
 #include <memory>
 
diff --git a/vendor_libs/test_vendor_lib/src/command_packet.cc b/vendor_libs/test_vendor_lib/src/command_packet.cc
index daaa562d5..8704f5ac9 100644
--- a/vendor_libs/test_vendor_lib/src/command_packet.cc
+++ b/vendor_libs/test_vendor_lib/src/command_packet.cc
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "command_packet"
 
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
+#include "command_packet.h"
 
 extern "C" {
 #include "hci/include/hci_hal.h"
diff --git a/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc b/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
index c6d78e5c5..19ea3b5b5 100644
--- a/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
+++ b/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "dual_mode_controller"
 
-#include "vendor_libs/test_vendor_lib/include/dual_mode_controller.h"
+#include "dual_mode_controller.h"
 
 #include <memory>
 
@@ -24,8 +24,8 @@
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/values.h"
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
-#include "vendor_libs/test_vendor_lib/include/hci_transport.h"
+#include "event_packet.h"
+#include "hci_transport.h"
 
 extern "C" {
 #include "osi/include/log.h"
@@ -539,12 +539,13 @@ void DualModeController::HciLeSetRandomAddress(const vector<uint8_t>& args) {
   SendCommandCompleteSuccess(HCI_BLE_WRITE_RANDOM_ADDR);
 }
 
-void DualModeController::HciLeSetAdvertisingParameters(const vector<uint8_t>& args){
+void DualModeController::HciLeSetAdvertisingParameters(
+    const vector<uint8_t>& args) {
   LogCommand("LE SetAdvertisingParameters");
   SendCommandCompleteSuccess(HCI_BLE_WRITE_ADV_PARAMS);
 }
 
-void DualModeController::HciLeSetAdvertisingData(const vector<uint8_t>& args){
+void DualModeController::HciLeSetAdvertisingData(const vector<uint8_t>& args) {
   LogCommand("LE SetAdvertisingData");
   SendCommandCompleteSuccess(HCI_BLE_WRITE_ADV_DATA);
 }
diff --git a/vendor_libs/test_vendor_lib/src/event_packet.cc b/vendor_libs/test_vendor_lib/src/event_packet.cc
index 15e8121be..4b9eb7e9b 100644
--- a/vendor_libs/test_vendor_lib/src/event_packet.cc
+++ b/vendor_libs/test_vendor_lib/src/event_packet.cc
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "event_packet"
 
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
+#include "event_packet.h"
 
 extern "C" {
 #include "osi/include/log.h"
diff --git a/vendor_libs/test_vendor_lib/src/hci_transport.cc b/vendor_libs/test_vendor_lib/src/hci_transport.cc
index b2c75e29a..4aefb0884 100644
--- a/vendor_libs/test_vendor_lib/src/hci_transport.cc
+++ b/vendor_libs/test_vendor_lib/src/hci_transport.cc
@@ -18,7 +18,7 @@
 
 #include <cinttypes>
 
-#include "vendor_libs/test_vendor_lib/include/hci_transport.h"
+#include "hci_transport.h"
 
 #include "base/bind.h"
 #include "base/threading/thread_task_runner_handle.h"
diff --git a/vendor_libs/test_vendor_lib/src/packet.cc b/vendor_libs/test_vendor_lib/src/packet.cc
index d99833b08..f119edd5b 100644
--- a/vendor_libs/test_vendor_lib/src/packet.cc
+++ b/vendor_libs/test_vendor_lib/src/packet.cc
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "packet"
 
-#include "vendor_libs/test_vendor_lib/include/packet.h"
+#include "packet.h"
 
 #include "base/logging.h"
 
diff --git a/vendor_libs/test_vendor_lib/src/packet_stream.cc b/vendor_libs/test_vendor_lib/src/packet_stream.cc
index 1d47425a9..187d32458 100644
--- a/vendor_libs/test_vendor_lib/src/packet_stream.cc
+++ b/vendor_libs/test_vendor_lib/src/packet_stream.cc
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "packet_stream"
 
-#include "vendor_libs/test_vendor_lib/include/packet_stream.h"
+#include "packet_stream.h"
 
 #include "base/logging.h"
 
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 3e23897f9..a1c969c07 100644
--- a/vendor_libs/test_vendor_lib/src/test_channel_transport.cc
+++ b/vendor_libs/test_vendor_lib/src/test_channel_transport.cc
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "test_channel_transport"
 
-#include "vendor_libs/test_vendor_lib/include/test_channel_transport.h"
+#include "test_channel_transport.h"
 
 #include "base/logging.h"
 
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 43a37960a..1ddc1d359 100644
--- a/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc
+++ b/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#include "vendor_libs/test_vendor_lib/include/hci_transport.h"
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
+#include "hci_transport.h"
+#include "command_packet.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
diff --git a/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc b/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc
index 2d56df3bf..bebf86562 100644
--- a/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc
+++ b/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc
@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
-#include "vendor_libs/test_vendor_lib/include/packet_stream.h"
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
-#include "vendor_libs/test_vendor_lib/include/packet.h"
+#include "packet_stream.h"
+#include "command_packet.h"
+#include "event_packet.h"
+#include "packet.h"
 
 #include <gtest/gtest.h>
 #include <cstdint>