diff options
| author | Colin Cross <ccross@android.com> | 2015-11-30 16:22:46 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-11-30 16:22:46 -0800 |
| commit | 0d754c260696659f08fc661e1d282b8d7be8ab73 (patch) | |
| tree | 622db50efc24cc95e1078283af60e328a0354723 | |
| parent | f1c2f04ef6c9f7ce3a76d06ddaab35a94f67f595 (diff) | |
| download | android_external_zlib-0d754c260696659f08fc661e1d282b8d7be8ab73.tar.gz android_external_zlib-0d754c260696659f08fc661e1d282b8d7be8ab73.tar.bz2 android_external_zlib-0d754c260696659f08fc661e1d282b8d7be8ab73.zip | |
Remove LOCAL_NDK_STL_VARIANT
LOCAL_NDK_STL_VARIANT := none is apparently not supported, go back to
using STL for the device NDK build case.
Bug: 25904002
Change-Id: I8e8b32c7274925168c321f60fe69b225dcfc0aa5
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -32,7 +32,6 @@ LOCAL_LDFLAGS_arm := -Wl,--hash-style=both LOCAL_SRC_FILES := $(zlib_files) ifneq ($(TARGET_BUILD_APPS),) LOCAL_SDK_VERSION := 9 - LOCAL_NDK_STL_VARIANT := none else LOCAL_CXX_STL := none endif @@ -48,7 +47,6 @@ LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) ifneq ($(TARGET_BUILD_APPS),) LOCAL_SDK_VERSION := 9 - LOCAL_NDK_STL_VARIANT := none else LOCAL_CXX_STL := none endif |