Merge 04000b682f7c4b9ea14d791dd144af763ef6977d on remote branch
Change-Id: I015e413f55060947ad9fd9f087de422bbc1714bf
diff --git a/Android.mk b/Android.mk
index 17558e2..b0646f1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,6 +5,7 @@
LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_COPY_HEADERS_TO := libjson/inc
LOCAL_COPY_HEADERS := bits.h \
config.h \