commit 2697b6b3bed796dd401ace06e7a3efa8ea6be40b
author qctecmdr Service <qctecmdr@qualcomm.com> Thu Jan 25 15:44:14 2018 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jan 25 15:44:14 2018 -0800
tree d92015f41a11abfc73317d78b4336a0efe082a31
parent af69584076840f20d0833c114bd5528a8d6f09a3
parent 51c7674d8f90209d5238249145ad5f093dddc9fc

Merge "Kernel Header Changes"

ipacm/src/Android.mk

diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index b02d720..4f00e8a 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -25,8 +25,8 @@
 LOCAL_C_INCLUDES += external/libnetfilter_conntrack/include
 LOCAL_C_INCLUDES += external/libnfnetlink/include
 
-#LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-#LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
 LOCAL_CFLAGS := -v
 LOCAL_CFLAGS += -DFEATURE_IPA_ANDROID

ipacm/src/IPACM_EvtDispatcher.cpp

diff --git a/ipacm/src/IPACM_EvtDispatcher.cpp b/ipacm/src/IPACM_EvtDispatcher.cpp
index 0a336aa..edb5901 100644
--- a/ipacm/src/IPACM_EvtDispatcher.cpp
+++ b/ipacm/src/IPACM_EvtDispatcher.cpp
@@ -36,7 +36,6 @@
 	@Author
 
 */
-#include <bits/in_addr.h>
 #include <string.h>
 #include <pthread.h>
 #include <IPACM_EvtDispatcher.h>