diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-30 17:40:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-30 17:40:48 +0000 |
| commit | d794cadaa862d4074e9a2778e92acf7b3dd02515 (patch) | |
| tree | 18290d11d7d8d5187d5ec2822b9f196443bc68fa | |
| parent | 6c271154bcd482feff7d3c95cc95591ad1f3b96a (diff) | |
| parent | 34d16f4673fed483b77373efa5b126448d2c9df3 (diff) | |
| download | android_hardware_qcom_bootctrl-d794cadaa862d4074e9a2778e92acf7b3dd02515.tar.gz android_hardware_qcom_bootctrl-d794cadaa862d4074e9a2778e92acf7b3dd02515.tar.bz2 android_hardware_qcom_bootctrl-d794cadaa862d4074e9a2778e92acf7b3dd02515.zip | |
Merge "Build bootctrl.* with BOARD_VNDK_VERSION"
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | boot_control.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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> |