diff options
| author | Daniel Mentz <danielmentz@google.com> | 2018-01-30 17:18:31 -0800 |
|---|---|---|
| committer | Daniel Mentz <danielmentz@google.com> | 2018-01-30 17:18:31 -0800 |
| commit | 490a14720f1e6d0c880e7aa9ab653606c500dbf3 (patch) | |
| tree | a5546390654474d7ea0e97256886f4130cde84ab | |
| parent | e40ccc24c5915f26ed2e4e9e7dbaa64d2b636767 (diff) | |
| parent | f94ed583afad25eea92faabbfaf3192fffa495f8 (diff) | |
| download | ipacfg-mgr-490a14720f1e6d0c880e7aa9ab653606c500dbf3.tar.gz | |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.096'
Change-Id: I94e27f2fea8697d1a99b4b954bdcbdd3155ec596
| -rw-r--r-- | ipacm/inc/IPACM_Defs.h | 1 | ||||
| -rw-r--r-- | ipacm/inc/IPACM_Netlink.h | 3 | ||||
| -rw-r--r-- | ipacm/src/Android.mk | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/ipacm/inc/IPACM_Defs.h b/ipacm/inc/IPACM_Defs.h index 3096974..149c03a 100644 --- a/ipacm/inc/IPACM_Defs.h +++ b/ipacm/inc/IPACM_Defs.h @@ -40,7 +40,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef IPA_CM_DEFS_H #define IPA_CM_DEFS_H -#include <bits/in_addr.h> #include <unistd.h> #include <fcntl.h> #include <linux/msm_ipa.h> diff --git a/ipacm/inc/IPACM_Netlink.h b/ipacm/inc/IPACM_Netlink.h index b0bdeb8..81f1968 100644 --- a/ipacm/inc/IPACM_Netlink.h +++ b/ipacm/inc/IPACM_Netlink.h @@ -51,6 +51,9 @@ extern "C" #include <pthread.h> #include <sys/select.h> #include <sys/socket.h> +#include <linux/socket.h> +#include <inaddr.h> +#define sockaddr_storage __kernel_sockaddr_storage #include <linux/if.h> #include <linux/if_addr.h> #include <linux/rtnetlink.h> diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk index 8db1dca..4f00e8a 100644 --- a/ipacm/src/Android.mk +++ b/ipacm/src/Android.mk @@ -25,6 +25,9 @@ LOCAL_C_INCLUDES += external/libxml2/include 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_CFLAGS := -v LOCAL_CFLAGS += -DFEATURE_IPA_ANDROID LOCAL_CFLAGS += -DFEATURE_IPACM_HAL -Wall -Werror -Wno-error=macro-redefined |