From 6c271154bcd482feff7d3c95cc95591ad1f3b96a Mon Sep 17 00:00:00 2001
From: Chris Fries <cfries@google.com>
Date: Fri, 23 Jun 2017 18:00:53 -0500
Subject: Android.mk: add sdm845

Bug: 62287998
Change-Id: Ia7df0c4e1070cdbf9040a1f95ac617b525d19c5f
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 9fd2d40..0be8dcb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,6 @@
 # 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.
-- 
cgit v1.2.3


From 34d16f4673fed483b77373efa5b126448d2c9df3 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Thu, 29 Jun 2017 15:25:09 +0900
Subject: Build bootctrl.* with BOARD_VNDK_VERSION

Replace the global include path with header libs. Change cutils/log.h to
log/log.h.

Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j bootctrl.msm8998
Change-Id: I55e48ad5856310d60b5093a3f47f479b865082c9
---
 Android.mk       | 4 ++--
 boot_control.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 9fd2d40..8491bff 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,10 +5,10 @@ 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 @@ include $(BUILD_SHARED_LIBRARY)
 
 # 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 539c52c..435ea2f 100644
--- a/boot_control.cpp
+++ b/boot_control.cpp
@@ -35,7 +35,7 @@ extern "C" {
 #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>
-- 
cgit v1.2.3