diff options
| author | Dan Albert <danalbert@google.com> | 2015-08-14 13:52:45 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-08-14 13:59:28 -0700 |
| commit | ead94aece8cf617c9b07b52d6d24e5a805ec5f48 (patch) | |
| tree | da31117467f7556161bf51821d86b53659fa7606 | |
| parent | e2f7e6dd3cb6e2e5ad9ee443e05a03c84ba2d818 (diff) | |
| download | android_external_zlib-ead94aece8cf617c9b07b52d6d24e5a805ec5f48.tar.gz android_external_zlib-ead94aece8cf617c9b07b52d6d24e5a805ec5f48.tar.bz2 android_external_zlib-ead94aece8cf617c9b07b52d6d24e5a805ec5f48.zip | |
Always use the NDK for unbundled branches.
Bug: http://b/23221721
Change-Id: I40c0c17d219580866733eedb2352681455bf7511
| -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) |