diff options
| author | Colin Cross <ccross@android.com> | 2015-11-30 19:46:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-30 19:46:33 +0000 |
| commit | f76334e899e2e1677ee3ed93fcd1299fd9756dfb (patch) | |
| tree | 0615c333173ce9ee1fb1fa4ace9a26d1cc0e81d6 | |
| parent | 0bfc9817277518086bf300b153a8e4eccdd88362 (diff) | |
| parent | e7d66d898ab2f3639938e77c6422ae1df37b10a4 (diff) | |
| download | android_external_zlib-f76334e899e2e1677ee3ed93fcd1299fd9756dfb.tar.gz android_external_zlib-f76334e899e2e1677ee3ed93fcd1299fd9756dfb.tar.bz2 android_external_zlib-f76334e899e2e1677ee3ed93fcd1299fd9756dfb.zip | |
Merge "Use LOCAL_NDK_STL_VARIANT instead of LOCAL_CXX_STL"
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -32,9 +32,11 @@ LOCAL_LDFLAGS_arm := -Wl,--hash-style=both LOCAL_SRC_FILES := $(zlib_files) ifneq ($(TARGET_BUILD_APPS),) LOCAL_SDK_VERSION := 9 + LOCAL_NDL_STL_VARIANT := none +else + LOCAL_CXX_STL := none endif LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_CXX_STL := none include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -46,9 +48,11 @@ LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) ifneq ($(TARGET_BUILD_APPS),) LOCAL_SDK_VERSION := 9 + LOCAL_NDL_STL_VARIANT := none +else + LOCAL_CXX_STL := none endif LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_CXX_STL := none include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) |