diff options
| author | Mangesh Ghiware <mghiware@google.com> | 2015-11-13 17:49:12 +0000 |
|---|---|---|
| committer | Mangesh Ghiware <mghiware@google.com> | 2015-11-13 17:49:12 +0000 |
| commit | 01e96b79a93d0ffcd2d6d6c4185d79800c1e7611 (patch) | |
| tree | f417e15c294be6cd4bcea1c8ab2d98abb961befe | |
| parent | 2303312eed0770d1311ebd0e299f91c011e6c3e1 (diff) | |
| download | leveldb-01e96b79a93d0ffcd2d6d6c4185d79800c1e7611.tar.gz | |
Revert "Use stlport_static for leveldb"
This reverts commit 2303312eed0770d1311ebd0e299f91c011e6c3e1.
Change-Id: I420195a0ac14b7690b3861fba12f9e111ffcfb2b
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -5,8 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := leveldb LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 9 -#LOCAL_NDK_STL_VARIANT := gnustl_static -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := gnustl_static LOCAL_CFLAGS := -D_REENTRANT -DOS_ANDROID -DLEVELDB_PLATFORM_POSIX -DNDEBUG -DSNAPPY LOCAL_CPP_EXTENSION := .cc LOCAL_C_INCLUDES := $(LOCAL_PATH)/leveldb-1.18 $(LOCAL_PATH)/leveldb-1.18/include $(LOCAL_PATH)/snappy-1.1.0 @@ -20,8 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := snappy LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 9 -#LOCAL_NDK_STL_VARIANT := gnustl_static -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := gnustl_static LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := snappy-1.1.0/snappy.cc snappy-1.1.0/snappy-sinksource.cc |