diff options
| author | Dan Albert <danalbert@google.com> | 2015-08-14 21:19:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-14 21:19:01 +0000 |
| commit | d7eb96c5b47d693c40c8c744f77f9c45ac3188b8 (patch) | |
| tree | da31117467f7556161bf51821d86b53659fa7606 | |
| parent | 9af3c19cc1eb87af57c619bdb583df04697641ec (diff) | |
| parent | 73f340863693dd5394082251f4fba8ce4f70c2d0 (diff) | |
| download | android_external_zlib-d7eb96c5b47d693c40c8c744f77f9c45ac3188b8.tar.gz android_external_zlib-d7eb96c5b47d693c40c8c744f77f9c45ac3188b8.tar.bz2 android_external_zlib-d7eb96c5b47d693c40c8c744f77f9c45ac3188b8.zip | |
am 73f34086: Merge "Always use the NDK for unbundled branches."
* commit '73f340863693dd5394082251f4fba8ce4f70c2d0':
Always use the NDK for unbundled branches.
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -31,10 +31,8 @@ LOCAL_LDFLAGS_arm := -Wl,--hash-style=both 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) @@ -46,10 +44,8 @@ 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) |