commit 086b507d1ef1f155440dab3a30818a939fbe45b6
author Steve Fung <stevefung@google.com> Mon Aug 10 02:19:06 2015 -0700
committer Steve Fung <stevefung@google.com> Mon Aug 10 11:16:00 2015 -0700
tree 8fbbade1f4620f38d1081bad54f5f7dbf7f43d2e
parent 49b1dbd35c4c0edb3399b8c24f110b2f6d008c4a

Export C Includes

Add LOCAL_EXPORT_C_INCLUDE_DIRS to the libpcre and libpcrecpp library
build targets so targets using it don't need to manually include the
header path.

Bug: 22486906

Change-Id: Ic30110bbbc9991dc1cee6666d7b89590bb95c111

Android.mk

diff --git a/Android.mk b/Android.mk
index dce0a3e..94a5170 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,6 +35,7 @@
 LOCAL_CFLAGS += -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/dist
 LOCAL_SRC_FILES := $(libpcre_src_files)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -42,6 +43,7 @@
 LOCAL_CFLAGS += -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/dist
 LOCAL_SRC_FILES := $(libpcre_src_files)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -49,6 +51,7 @@
 LOCAL_CFLAGS += -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/dist
 LOCAL_SRC_FILES := $(libpcre_src_files)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_SHARED_LIBRARY)
 
 # === libpcrecpp targets ===
@@ -60,4 +63,5 @@
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := $(libpcrecpp_src_files)
 LOCAL_SHARED_LIBRARIES := libpcre
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_SHARED_LIBRARY)