commit e40ccc24c5915f26ed2e4e9e7dbaa64d2b636767
author Daniel Mentz <danielmentz@google.com> Fri Jan 19 15:14:29 2018 -0800
committer Daniel Mentz <danielmentz@google.com> Fri Jan 19 15:14:29 2018 -0800
tree c9d9c23c04a44fb803efdd02b4e04e9ffb176bbe
parent 0a91f5dbfd5bfa28fbe7f94124749141de9ec303
parent eb9f260cdade1bc33908b3fb30a5590e1dae9715

Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.00015.1'

Change-Id: I359b88d3419ef72c8f60863d3f446433783529bf

hal/Android.mk

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 \

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