diff options
| author | Elliott Hughes <enh@google.com> | 2015-03-10 01:49:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-10 01:49:32 +0000 |
| commit | 428aa1f0d2b7d3a54b08673d61bc11cc3ee5c1a6 (patch) | |
| tree | 358cd8ea92d70fd21c07a64be4d5613bfc997756 | |
| parent | 79547e027abdfb4b2106f136ade2b6fd5f9b12d2 (diff) | |
| parent | f185676ef11dd491a06cb90e5f1e49bcc9ca717a (diff) | |
| download | android_external_zlib-428aa1f0d2b7d3a54b08673d61bc11cc3ee5c1a6.tar.gz android_external_zlib-428aa1f0d2b7d3a54b08673d61bc11cc3ee5c1a6.tar.bz2 android_external_zlib-428aa1f0d2b7d3a54b08673d61bc11cc3ee5c1a6.zip | |
Merge "Add Build type check before using NDK."
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -26,9 +26,11 @@ LOCAL_MODULE := libz LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) +ifneq ($(TARGET_BUILD_APPS),) ifeq ($(TARGET_ARCH),arm) LOCAL_SDK_VERSION := 9 endif +endif LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_SHARED_LIBRARY) @@ -39,9 +41,11 @@ LOCAL_MODULE := libz LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) +ifneq ($(TARGET_BUILD_APPS),) ifeq ($(TARGET_ARCH),arm) LOCAL_SDK_VERSION := 9 endif +endif LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_STATIC_LIBRARY) |