commit 3d55bd42a15bfe9c00bbb5b058255fa37fe571fd
author Aaron Ding <aaronding@google.com> Wed Jun 13 18:38:46 2018 +0800
committer Aaron Ding <aaronding@google.com> Thu Jun 14 13:24:47 2018 +0800
tree 3e8ec32857bbb449b0417dd019d60c1e2f1a189c
parent c75c8a4b7b96a72360c0c1372189ed68704010d6
parent 7c82b07966b2d7a16243ab67c407e7c587751b69

Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.376' into pi-dev

Bug: 110126338
Change-Id: Ia65d68058e2263e432790a681cf1b6acc3d98741

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index 6ebca46..d37c766 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -12,6 +12,7 @@
 LOCAL_MODULE := liboffloadhal
 
 #LOCAL_CPP_FLAGS := -Wall -Werror
+LOCAL_CFLAGS += -Wno-error
 LOCAL_SHARED_LIBRARIES := libhwbinder \
                         libhidlbase \
                         libhidltransport \

ipacm/inc/IPACM_Netlink.h

diff --git a/ipacm/inc/IPACM_Netlink.h b/ipacm/inc/IPACM_Netlink.h
index 81f1968..7a1a939 100644
--- a/ipacm/inc/IPACM_Netlink.h
+++ b/ipacm/inc/IPACM_Netlink.h
@@ -52,8 +52,6 @@
 #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>

os_pickup.mk

diff --git a/os_pickup.mk b/os_pickup.mk
new file mode 100644
index 0000000..6103ffb
--- /dev/null
+++ b/os_pickup.mk
@@ -0,0 +1,4 @@
+ifeq ($(TARGET_BOARD_PLATFORM),sdm845)
+LOCAL_PATH := $(call my-dir)
+include $(call first-makefiles-under,$(LOCAL_PATH))
+endif