openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "liblogcat: LOCAL_C_INCLUDE_DIRS correction" 

am: 01815fdcc5

Change-Id: I28a7645ab5375f234b74c6555f774510cb364a8e
This commit is contained in:
Mark Salyzyn 2017-02-21 19:41:50 +00:00 committed by android-build-merger
parent 8eef0a5dfb 01815fdcc5
commit 88af7ccd58
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
logcat/Android.mk
View File

@ -9,7 +9,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := logcat
LOCAL_SRC_FILES := logcat_main.cpp event.logtags
LOCAL_SHARED_LIBRARIES := liblogcat $(logcatLibs)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -Werror
include $(BUILD_EXECUTABLE)
@ -20,7 +19,7 @@ LOCAL_MODULE := liblogcat
LOCAL_SRC_FILES := logcat.cpp logcat_system.cpp
LOCAL_SHARED_LIBRARIES := $(logcatLibs)
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDES_DIR := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -Werror
include $(BUILD_SHARED_LIBRARY)

1
logcat/tests/Android.mk
View File

@ -57,6 +57,5 @@ LOCAL_MODULE := $(test_module_prefix)unit-tests
LOCAL_MODULE_TAGS := $(test_tags)
LOCAL_CFLAGS += $(test_c_flags)
LOCAL_SHARED_LIBRARIES := liblog libbase liblogcat
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
LOCAL_SRC_FILES := $(test_src_files)
include $(BUILD_NATIVE_TEST)