diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-01 19:04:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-01 19:04:24 +0000 |
| commit | f42217451397d7637b46f8478a5e77df3083baaa (patch) | |
| tree | 868bfe91a13eacfd5f93b1d850896aad0f5eb709 | |
| parent | 8d977782c1cfe9d75cc9a464439c2ff1e27e1665 (diff) | |
| parent | 7b85b8b3b19187c5ab10a16a24ec3e1557ab19f5 (diff) | |
| download | android_external_zlib-f42217451397d7637b46f8478a5e77df3083baaa.tar.gz android_external_zlib-f42217451397d7637b46f8478a5e77df3083baaa.tar.bz2 android_external_zlib-f42217451397d7637b46f8478a5e77df3083baaa.zip | |
Merge "Add LOCAL_EXPORT_C_INCLUDES_DIRS to library builds."
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -29,6 +29,7 @@ LOCAL_SRC_FILES := $(zlib_files) ifeq ($(TARGET_ARCH),arm) LOCAL_SDK_VERSION := 9 endif +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -41,6 +42,7 @@ LOCAL_SRC_FILES := $(zlib_files) ifeq ($(TARGET_ARCH),arm) LOCAL_SDK_VERSION := 9 endif +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -51,6 +53,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) LOCAL_MULTILIB := both +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_HOST_STATIC_LIBRARY) @@ -62,6 +65,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) LOCAL_MULTILIB := both +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_HOST_SHARED_LIBRARY) @@ -78,6 +82,7 @@ LOCAL_SRC_FILES := $(zlib_files) LOCAL_MODULE:= libunz LOCAL_ARM_MODE := arm LOCAL_MULTILIB := both +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -87,6 +92,7 @@ LOCAL_ARM_MODE := arm ifeq ($(TARGET_ARCH),arm) LOCAL_SDK_VERSION := 9 endif +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) |