diff options
| author | Daniel Erat <derat@google.com> | 2015-07-08 15:26:13 -0600 |
|---|---|---|
| committer | Rom Lemarchand <romlem@google.com> | 2015-11-16 14:27:18 -0800 |
| commit | 31f5915e3467f8a5afc6273d90793e7211063cb8 (patch) | |
| tree | b3a0dc0348174d15cc530f3ae066d6c3f953aade | |
| parent | e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a (diff) | |
| download | expat-31f5915e3467f8a5afc6273d90793e7211063cb8.tar.gz | |
Set LOCAL_EXPORT_C_INCLUDE_DIRS in Android.mk.
Export the lib/ directory to increase compatibility with
third-party code that includes <expat.h>.
(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
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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) |