Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.245' into pi-dev
Bug: 77871398
Change-Id: I6ee756786d9413ff083cb7b3933de2a8aa648a28
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 \
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>
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