Add explicit liblog dependency

Explicitly add liblog as dependency for modules that
use Android logging.  Also fix a const char*/char*
assignment.

CRs-Fixed: 1109248
Change-Id: I434179f04f4386e73e7e9ee79ab8cd283ebafc91
This commit is contained in:
David Ng
2016-12-08 23:51:23 -08:00
committed by Naseer Ahmed
parent f720701b12
commit 6c44d14e18
4 changed files with 4 additions and 4 deletions

View File

@@ -7,7 +7,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) $(common_header_export_path) LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) $(common_header_export_path)
LOCAL_CFLAGS := -Wno-unused-parameter -DLOG_TAG=\"SDM\" $(common_flags) LOCAL_CFLAGS := -Wno-unused-parameter -DLOG_TAG=\"SDM\" $(common_flags)
LOCAL_HW_INTF_PATH := fb LOCAL_HW_INTF_PATH := fb
LOCAL_SHARED_LIBRARIES := libdl libsdmutils LOCAL_SHARED_LIBRARIES := libdl liblog libsdmutils
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
LOCAL_SRC_FILES := core_interface.cpp \ LOCAL_SRC_FILES := core_interface.cpp \
core_impl.cpp \ core_impl.cpp \

View File

@@ -15,7 +15,7 @@ LOCAL_CLANG := true
LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware libhardware_legacy \ LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware libhardware_legacy \
libutils libcutils libsync libmemalloc libqdutils libdl \ libutils libcutils libsync libmemalloc libqdutils libdl \
libpowermanager libsdmutils libgpu_tonemapper libc++ libpowermanager libsdmutils libgpu_tonemapper libc++ liblog
LOCAL_SRC_FILES := hwc_session.cpp \ LOCAL_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \ hwc_display.cpp \

View File

@@ -1416,7 +1416,7 @@ void* HWCSession::HWCUeventThreadHandler() {
int HWCSession::GetEventValue(const char *uevent_data, int length, const char *event_info) { int HWCSession::GetEventValue(const char *uevent_data, int length, const char *event_info) {
const char *iterator_str = uevent_data; const char *iterator_str = uevent_data;
while (((iterator_str - uevent_data) <= length) && (*iterator_str)) { while (((iterator_str - uevent_data) <= length) && (*iterator_str)) {
char *pstr = strstr(iterator_str, event_info); const char *pstr = strstr(iterator_str, event_info);
if (pstr != NULL) { if (pstr != NULL) {
return (atoi(iterator_str + strlen(event_info))); return (atoi(iterator_str + strlen(event_info)));
} }

View File

@@ -17,7 +17,7 @@ LOCAL_CLANG := true
LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware libhardware_legacy \ LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware libhardware_legacy \
libutils libcutils libsync libmemalloc libqdutils libdl \ libutils libcutils libsync libmemalloc libqdutils libdl \
libpowermanager libsdmutils libc++ libpowermanager libsdmutils libc++ liblog
LOCAL_SRC_FILES := hwc_session.cpp \ LOCAL_SRC_FILES := hwc_session.cpp \
hwc_display.cpp \ hwc_display.cpp \