commit f191b0eb192cb7cc3ea8352d66bb0fdaa31592a7
author Jerry Zhang <zhangjerry@google.com> Tue Feb 21 22:52:56 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 21 22:52:57 2017 +0000
tree b8cb6786bb819afacb77f886d44529a2e1b9f05a
parent 679ec7147cf2f8da789ddcb4df72311a9546d5b3
parent 50c5be23710efa20348c04d97c6ad2d7120a11ee

Merge "adb: set max_rw to USB_FFS_BULK_SIZE explicitly"

logcat/Android.mk

diff --git a/logcat/Android.mk b/logcat/Android.mk
index 5ed0938..723c35e 100644
--- a/logcat/Android.mk
+++ b/logcat/Android.mk
@@ -9,7 +9,6 @@
 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_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

diff --git a/logcat/tests/Android.mk b/logcat/tests/Android.mk
index bfb20f0..1c3feba 100644
--- a/logcat/tests/Android.mk
+++ b/logcat/tests/Android.mk
@@ -57,6 +57,5 @@
 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)