DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Icb05ceb25b23c74c1cf8cedc2e20ed658d5299a6
diff --git a/Android.mk b/Android.mk
index 9fd2d40..03a11d3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,14 +1,14 @@
# TODO: Find a better way to separate build configs for ADP vs non-ADP devices
ifneq ($(BOARD_IS_AUTOMOTIVE),true)
-ifneq ($(filter msm8996 msm8998,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8996 msm8998 sdm845,$(TARGET_BOARD_PLATFORM)),)
LOCAL_PATH := $(call my-dir)
# HAL Shared library for the target. Used by libhardware.
include $(CLEAR_VARS)
-LOCAL_C_INCLUDES += hardware/libhardware/include
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/gpt-utils/inc
LOCAL_CFLAGS += -Wall -Werror
LOCAL_SHARED_LIBRARIES += liblog libgptutils libcutils
+LOCAL_HEADER_LIBRARIES := libhardware_headers libsystem_headers
LOCAL_SRC_FILES := boot_control.cpp
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE := bootctrl.$(TARGET_BOARD_PLATFORM)
@@ -18,10 +18,10 @@
# Static library for the target. Used by update_engine_sideload from recovery.
include $(CLEAR_VARS)
-LOCAL_C_INCLUDES += hardware/libhardware/include
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/gpt-utils/inc
LOCAL_CFLAGS += -Wall -Werror
LOCAL_SHARED_LIBRARIES += liblog libgptutils libcutils
+LOCAL_HEADER_LIBRARIES := libhardware_headers libsystem_headers
LOCAL_SRC_FILES := boot_control.cpp
LOCAL_MODULE := bootctrl.$(TARGET_BOARD_PLATFORM)
include $(BUILD_STATIC_LIBRARY)
diff --git a/boot_control.cpp b/boot_control.cpp
index 912e382..947e0d5 100644
--- a/boot_control.cpp
+++ b/boot_control.cpp
@@ -35,7 +35,7 @@
#endif
#include <errno.h>
#define LOG_TAG "bootcontrolhal"
-#include <cutils/log.h>
+#include <log/log.h>
#include <hardware/boot_control.h>
#include <stdio.h>
#include <string.h>
