diff options
Diffstat (limited to 'build-android/jni/Android.mk')
| -rw-r--r-- | build-android/jni/Android.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index a7581c99..9b47cf0e 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -28,13 +28,17 @@ includes = \ $(LIBXML2_PATH)/include \ $(TIDY_HTML5_PATH)/include \ $(OPENSSL_PATH)/include \ - $(ANDROID_NDK)/sources/cxx-stl/llvm-libc++/libcxx/include \ - $(ANDROID_NDK)/sources/cxx-stl/llvm-libc++abi/libcxxabi/include \ + $(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/include \ + $(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(TARGET_ARCH_ABI)/include \ $(addprefix $(src_dir)/, $(subdirs)) +# $(ANDROID_NDK)/sources/cxx-stl/llvm-libc++/libcxx/include +# $(ANDROID_NDK)/sources/cxx-stl/llvm-libc++abi/libcxxabi/include + core_excludes = MCWin32.cpp MCStringWin32.cpp MCMainThreadWin32.cpp MCMainThreadGTK.cpp core_src_files := $(filter-out \ $(addprefix $(src_dir)/core/basetypes/, $(core_excludes)), \ $(wildcard $(src_dir)/core/basetypes/*.cpp) $(wildcard $(src_dir)/core/basetypes/*.c)) + abstract_src_files := $(wildcard $(src_dir)/core/abstract/*.cpp) imap_src_files := $(wildcard $(src_dir)/core/imap/*.cpp) nntp_src_files := $(wildcard $(src_dir)/core/nntp/*.cpp) @@ -117,7 +121,10 @@ LOCAL_SRC_FILES := \ $(async_imap_src_files) $(async_nntp_src_files) $(async_pop_src_files) $(async_smtp_src_files) LOCAL_CPPFLAGS := -frtti LOCAL_CFLAGS := -DNOCRYPT +# LOCAL_LDLIBS := -lz -llog \ +# -lc++_shared -L$(ANDROID_NDK)/sources/cxx-stl/llvm-libc++/libs/$(TARGET_ARCH_ABI) LOCAL_LDLIBS := -lz -llog \ - -lc++_shared -L$(ANDROID_NDK)/sources/cxx-stl/llvm-libc++/libs/$(TARGET_ARCH_ABI) + -lgnustl_shared -L$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(TARGET_ARCH_ABI) +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_STATIC_LIBRARIES := etpan sasl2 ssl crypto icu4c xml2 tidy ctemplate include $(BUILD_SHARED_LIBRARY) |