diff --git a/hal/Android.mk b/hal/Android.mk
index 6574682..dc4dd1b 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -11,6 +11,7 @@
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/inc
 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