From eb40816fb8e6a53456b4b3b57414d94d37a09f93 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Tue, 21 Feb 2017 08:45:21 -0800
Subject: [PATCH] liblogcat: LOCAL_C_INCLUDE_DIRS correction

Test: compile
Bug: 35326290
Change-Id: I62b46443a6b9149577e85d4f512c3946b467a1fb
---
 logcat/Android.mk       | 3 +--
 logcat/tests/Android.mk | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/logcat/Android.mk b/logcat/Android.mk
index 5ed0938fd..723c35e97 100644
--- a/logcat/Android.mk
+++ b/logcat/Android.mk
@@ -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)
diff --git a/logcat/tests/Android.mk b/logcat/tests/Android.mk
index bfb20f039..1c3febac3 100644
--- a/logcat/tests/Android.mk
+++ b/logcat/tests/Android.mk
@@ -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)