From 31f5915e3467f8a5afc6273d90793e7211063cb8 Mon Sep 17 00:00:00 2001 From: Daniel Erat Date: Wed, 8 Jul 2015 15:26:13 -0600 Subject: Set LOCAL_EXPORT_C_INCLUDE_DIRS in Android.mk. Export the lib/ directory to increase compatibility with third-party code that includes . (Android.mk currently copies expat.h and expat_external.h to /usr/include/libexpat, but this location is non-standard.) Bug: 22328216 (cherry picked from commit e665ddbe2535c55032569b0c41e9d728bef1f65b) Change-Id: I734b2ee3ad3402b43ec44d6dd0f38aca5041ea21 --- Android.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index 8e3eaf0f..14977013 100644 --- a/Android.mk +++ b/Android.mk @@ -26,6 +26,7 @@ common_COPY_HEADERS := \ # For the host # ===================================================== +# Host static library include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_SRC_FILES) @@ -39,12 +40,13 @@ endif LOCAL_MODULE:= libexpat LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) - +# Host shared library include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_SRC_FILES) @@ -60,6 +62,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) @@ -84,6 +87,7 @@ LOCAL_C_INCLUDES += $(common_C_INCLUDES) LOCAL_MODULE:= libexpat_static LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib include $(BUILD_STATIC_LIBRARY) @@ -106,5 +110,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := optional LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO) LOCAL_COPY_HEADERS := $(common_COPY_HEADERS) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/lib include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3