diff options
| author | Colin Cross <ccross@android.com> | 2015-11-30 11:04:49 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-11-30 11:05:36 -0800 |
| commit | 9bffa77ef826279f3b014868055c77e7fb6231f9 (patch) | |
| tree | ff6f0f764f7968c2334bfd0e5df6695ce8e89e6b | |
| parent | abca4b6b1e0fa90fb5495b7087a3d1e1b58381f2 (diff) | |
| download | android_external_zlib-9bffa77ef826279f3b014868055c77e7fb6231f9.tar.gz android_external_zlib-9bffa77ef826279f3b014868055c77e7fb6231f9.tar.bz2 android_external_zlib-9bffa77ef826279f3b014868055c77e7fb6231f9.zip | |
Remove STL dependency
zlib doesn't use STL, remove the dependency using LOCAL_CXX_STL := none
to allow modules that depend on zlib to select a non-default STL without
conflicting with the default STL linked into zlib.
Bug: 25904002
Change-Id: I532cecb7c7c47fbbb3c91673791bfdc48ffff355
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -34,6 +34,7 @@ ifneq ($(TARGET_BUILD_APPS),) LOCAL_SDK_VERSION := 9 endif LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_CXX_STL := none include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -47,6 +48,7 @@ ifneq ($(TARGET_BUILD_APPS),) LOCAL_SDK_VERSION := 9 endif LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_CXX_STL := none include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -58,6 +60,7 @@ LOCAL_SRC_FILES := $(zlib_files) LOCAL_MULTILIB := both LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_MODULE_HOST_OS := darwin linux windows +LOCAL_CXX_STL := none include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -68,6 +71,7 @@ LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) LOCAL_MULTILIB := both LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_CXX_STL := none include $(BUILD_HOST_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -79,6 +83,8 @@ LOCAL_MODULE:= gzip LOCAL_SHARED_LIBRARIES := libz +LOCAL_CXX_STL := none + include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -90,4 +96,6 @@ LOCAL_MODULE:= minigzip LOCAL_STATIC_LIBRARIES := libz +LOCAL_CXX_STL := none + include $(BUILD_HOST_EXECUTABLE) |