diff options
| author | Colin Cross <ccross@android.com> | 2015-12-01 00:23:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-01 00:23:55 +0000 |
| commit | 59f86b5afa934978f98060a70a4f4aa793454682 (patch) | |
| tree | 622db50efc24cc95e1078283af60e328a0354723 | |
| parent | 79f0326eec0284e1cf8892645778b720744aaced (diff) | |
| parent | 0d754c260696659f08fc661e1d282b8d7be8ab73 (diff) | |
| download | zlib-brillo-m9-release.tar.gz | |
Merge "Remove LOCAL_NDK_STL_VARIANT"brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-dev
| -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 |