diff options
| author | Xin Li <delphij@google.com> | 2017-12-06 11:52:04 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2017-12-06 14:24:51 -0800 |
| commit | bb80b0f386d7babd8db5ede168ecf74c1a9a9a4f (patch) | |
| tree | 11e056bb3d72d766f16136e04a48afd77c52bf59 | |
| parent | 8d5e2b337916fd8df3175f39e7b56e146a1f8ba3 (diff) | |
| parent | 1d4d0f1dd9cab215bbc118b6eb9cd846a18b148b (diff) | |
| download | android_hardware_qcom_bootctrl-bb80b0f386d7babd8db5ede168ecf74c1a9a9a4f.tar.gz android_hardware_qcom_bootctrl-bb80b0f386d7babd8db5ede168ecf74c1a9a9a4f.tar.bz2 android_hardware_qcom_bootctrl-bb80b0f386d7babd8db5ede168ecf74c1a9a9a4f.zip | |
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Icb05ceb25b23c74c1cf8cedc2e20ed658d5299a6
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | boot_control.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -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 @@ 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 912e382..947e0d5 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> |