Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fba6f262 authored Feb 21, 2017 by Mark Salyzyn Committed by android-build-merger Feb 21, 2017

Merge "liblogcat: LOCAL_C_INCLUDE_DIRS correction" am: 01815fdc am: 88af7ccd

am: dc5d05ba

Change-Id: I07e9c836dee8f49981e370f0feabe417cd3d7337

parents 330eb9e3 dc5d05ba

logcat/Android.mk

+1 −2

Original line number	Diff line number	Diff line
		@@ -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)

logcat/tests/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -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)