Change include directory

This make our local headers clearly wificond prefixed.

TEST=compile
BUG=None

Change-Id: I68cc9efd2f73bec7a4cbec09a470af58420ac3e1

diff --git a/Android.mk b/Android.mk
index bbe7dfd..b5527c1 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -13,8 +13,11 @@
 # limitations under the License.
 
 LOCAL_PATH := $(call my-dir)
-
 wificond_cpp_flags := -std=c++11 -Wall -Werror -Wno-unused-parameter
+wificond_parent_dir := $(LOCAL_PATH)/../
+wificond_includes := \
+    $(wificond_parent_dir)
+
 
 ###
 ### wificond daemon.
@@ -23,6 +26,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := wificond
 LOCAL_CPPFLAGS := $(wificond_cpp_flags)
 LOCAL_INIT_RC := wificond.rc
+LOCAL_C_INCLUDES := $(wificond_includes)
 LOCAL_SRC_FILES := \
     main.cpp
 LOCAL_SHARED_LIBRARIES := \
@@ -42,6 +46,7 @@ include $(BUILD_EXECUTABLE)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libwificond
 LOCAL_CPPFLAGS := $(wificond_cpp_flags)
+LOCAL_C_INCLUDES := $(wificond_includes)
 LOCAL_SRC_FILES := \
     ap_interface_binder.cpp \
     ap_interface_impl.cpp \
@@ -65,6 +70,7 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libwificond_nl
 LOCAL_CPPFLAGS := $(wificond_cpp_flags)
+LOCAL_C_INCLUDES := $(wificond_includes)
 LOCAL_SRC_FILES := \
     net/nl80211_attribute.cpp \
     net/nl80211_packet.cpp
@@ -78,6 +84,7 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libwificond_ipc
 LOCAL_AIDL_INCLUDES += $(LOCAL_PATH)/aidl
+LOCAL_C_INCLUDES := $(wificond_includes)
 LOCAL_CPPFLAGS := $(wificond_cpp_flags)
 LOCAL_SRC_FILES := \
     ipc_constants.cpp \
@@ -94,6 +101,7 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE := libwificond_test_utils
 LOCAL_CPPFLAGS := $(wificond_cpp_flags)
+LOCAL_C_INCLUDES := $(wificond_includes)
 LOCAL_SRC_FILES := \
     tests/shell_utils.cpp
 LOCAL_SHARED_LIBRARIES := \
@@ -106,6 +114,7 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE := wificond_unit_test
 LOCAL_CPPFLAGS := $(wificond_cpp_flags)
+LOCAL_C_INCLUDES := $(wificond_includes)
 LOCAL_SRC_FILES := \
     tests/main.cpp \
     tests/looper_backed_event_loop_unittest.cpp \
@@ -136,6 +145,7 @@ include $(BUILD_NATIVE_TEST)
 include $(CLEAR_VARS)
 LOCAL_MODULE := wificond_integration_test
 LOCAL_CPPFLAGS := $(wificond_cpp_flags)
+LOCAL_C_INCLUDES := $(wificond_includes)
 LOCAL_SRC_FILES := \
     tests/main.cpp \
     tests/integration/life_cycle_test.cpp

diff --git a/ap_interface_binder.cpp b/ap_interface_binder.cpp
index 8f3a135..5b5711f 100644 (file)
--- a/ap_interface_binder.cpp
+++ b/ap_interface_binder.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ap_interface_binder.h"
+#include "wificond/ap_interface_binder.h"
 
 namespace android {
 namespace wificond {

diff --git a/ap_interface_impl.cpp b/ap_interface_impl.cpp
index c7974a7..1327f11 100644 (file)
--- a/ap_interface_impl.cpp
+++ b/ap_interface_impl.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "ap_interface_impl.h"
+#include "wificond/ap_interface_impl.h"
 
-#include "ap_interface_binder.h"
+#include "wificond/ap_interface_binder.h"
 
 using android::net::wifi::IApInterface;
 

diff --git a/client_interface.cpp b/client_interface.cpp
index 1159097..c501b8d 100644 (file)
--- a/client_interface.cpp
+++ b/client_interface.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "client_interface.h"
+#include "wificond/client_interface.h"
 
 namespace android {
 namespace wificond {

diff --git a/ipc_constants.cpp b/ipc_constants.cpp
index b02a8d9..ac4139b 100644 (file)
--- a/ipc_constants.cpp
+++ b/ipc_constants.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ipc_constants.h"
+#include "wificond/ipc_constants.h"
 
 namespace android {
 namespace wificond {

diff --git a/looper_backed_event_loop.cpp b/looper_backed_event_loop.cpp
index aea8422..6ab6fe6 100644 (file)
--- a/looper_backed_event_loop.cpp
+++ b/looper_backed_event_loop.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <looper_backed_event_loop.h>
+#include "wificond/looper_backed_event_loop.h"
 
 #include <android-base/logging.h>
 #include <utils/Looper.h>

diff --git a/main.cpp b/main.cpp
index 63b12ab..5a982b4 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -30,9 +30,9 @@
 #include <wifi_system/hal_tool.h>
 #include <wifi_system/interface_tool.h>
 
-#include "ipc_constants.h"
-#include "looper_backed_event_loop.h"
-#include "server.h"
+#include "wificond/ipc_constants.h"
+#include "wificond/looper_backed_event_loop.h"
+#include "wificond/server.h"
 
 using android::net::wifi::IWificond;
 using android::wifi_hal::DriverTool;

diff --git a/net/nl80211_attribute.cpp b/net/nl80211_attribute.cpp
index 5ff9c9c..209df54 100644 (file)
--- a/net/nl80211_attribute.cpp
+++ b/net/nl80211_attribute.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "net/nl80211_attribute.h"
+#include "wificond/net/nl80211_attribute.h"
 
 #include <android-base/logging.h>
 

diff --git a/net/nl80211_packet.cpp b/net/nl80211_packet.cpp
index ad9726b..cd2315c 100644 (file)
--- a/net/nl80211_packet.cpp
+++ b/net/nl80211_packet.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "net/nl80211_packet.h"
+#include "wificond/net/nl80211_packet.h"
 
 #include <android-base/logging.h>
 

diff --git a/net/nl80211_packet.h b/net/nl80211_packet.h
index 8dd846d..4066513 100644 (file)
--- a/net/nl80211_packet.h
+++ b/net/nl80211_packet.h
@@ -25,7 +25,7 @@
 
 #include <android-base/macros.h>
 
-#include "net/nl80211_attribute.h"
+#include "wificond/net/nl80211_attribute.h"
 
 namespace android {
 namespace wificond {

diff --git a/server.cpp b/server.cpp
index 202f012..96257c8 100644 (file)
--- a/server.cpp
+++ b/server.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "server.h"
+#include "wificond/server.h"
 
 using android::binder::Status;
 using android::sp;

diff --git a/server.h b/server.h
index 991ecbe..9799748 100644 (file)
--- a/server.h
+++ b/server.h
@@ -27,7 +27,7 @@
 
 #include "android/net/wifi/BnWificond.h"
 
-#include "ap_interface_impl.h"
+#include "wificond/ap_interface_impl.h"
 
 namespace android {
 namespace wificond {

diff --git a/tests/integration/life_cycle_test.cpp b/tests/integration/life_cycle_test.cpp
index 65da4eb..08997dc 100644 (file)
--- a/tests/integration/life_cycle_test.cpp
+++ b/tests/integration/life_cycle_test.cpp
@@ -28,8 +28,8 @@
 
 #include "android/net/wifi/IApInterface.h"
 #include "android/net/wifi/IWificond.h"
-#include "ipc_constants.h"
-#include "tests/shell_utils.h"
+#include "wificond/ipc_constants.h"
+#include "wificond/tests/shell_utils.h"
 
 using android::String16;
 using android::base::Trim;

diff --git a/tests/looper_backed_event_loop_unittest.cpp b/tests/looper_backed_event_loop_unittest.cpp
index 27f0881..4865a95 100644 (file)
--- a/tests/looper_backed_event_loop_unittest.cpp
+++ b/tests/looper_backed_event_loop_unittest.cpp
@@ -24,7 +24,7 @@
 #include <utils/Errors.h>
 #include <utils/StopWatch.h>
 
-#include <looper_backed_event_loop.h>
+#include "wificond/looper_backed_event_loop.h"
 
 namespace {
 

diff --git a/tests/nl80211_attribute_unittest.cpp b/tests/nl80211_attribute_unittest.cpp
index 86cad8d..af62aee 100644 (file)
--- a/tests/nl80211_attribute_unittest.cpp
+++ b/tests/nl80211_attribute_unittest.cpp
@@ -20,7 +20,7 @@
 
 #include <linux/nl80211.h>
 
-#include "net/nl80211_attribute.h"
+#include "wificond/net/nl80211_attribute.h"
 
 namespace android {
 namespace wificond {

diff --git a/tests/nl80211_packet_unittest.cpp b/tests/nl80211_packet_unittest.cpp
index 49274cb..8fd2637 100644 (file)
--- a/tests/nl80211_packet_unittest.cpp
+++ b/tests/nl80211_packet_unittest.cpp
@@ -20,8 +20,8 @@
 
 #include <linux/nl80211.h>
 
-#include "net/nl80211_attribute.h"
-#include "net/nl80211_packet.h"
+#include "wificond/net/nl80211_attribute.h"
+#include "wificond/net/nl80211_packet.h"
 
 using std::string;
 

diff --git a/tests/shell_unittest.cpp b/tests/shell_unittest.cpp
index e07dbca..6c2d5ba 100644 (file)
--- a/tests/shell_unittest.cpp
+++ b/tests/shell_unittest.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "tests/shell_utils.h"
+#include "wificond/tests/shell_utils.h"
 
 using android::wificond::tests::integration::RunShellCommand;
 using std::string;

diff --git a/tests/shell_utils.cpp b/tests/shell_utils.cpp
index b45f529..37c1a1a 100644 (file)
--- a/tests/shell_utils.cpp
+++ b/tests/shell_utils.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "tests/shell_utils.h"
+#include "wificond/tests/shell_utils.h"
 
 #include <fcntl.h>
 #include <poll.h>