diff options
| author |  Hoa V. Dinh <dinh.viet.hoa@gmail.com> | 2015-01-22 16:20:39 -0800 |
|---|---|---|
| committer | Hoa V. Dinh <dinh.viet.hoa@gmail.com> | 2015-01-22 16:20:44 -0800 |
| commit | b316ac7a659c776b041557ca9e91ff57414c903b (patch) | |
| tree | a7e7777a89fd8634aaf0336860cb900b67d1ae5c /build-android | |
| parent | 2f56aab918b687d5f863ce66031c7619c8e18ee1 (diff) | |
Removed uchardet dependency on Android
Diffstat (limited to 'build-android')
| -rwxr-xr-x | build-android/build.sh | 2 | ||||
| -rw-r--r-- | build-android/jni/Android.mk | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/build-android/build.sh b/build-android/build.sh index 74f328dc..bd2fbb05 100755 --- a/build-android/build.sh +++ b/build-android/build.sh @@ -48,7 +48,6 @@ function build { ICU4C_PATH=$current_dir/third-party/icu4c-android-1 \ LIBETPAN_PATH=$current_dir/third-party/libetpan-android-1 \ LIBXML2_PATH=$current_dir/third-party/libxml2-android-1 \ - UCHARDET_PATH=$current_dir/third-party/uchardet-android-1 \ TIDY_HTML5_PATH=$current_dir/third-party/tidy-html5-android-1 \ OPENSSL_PATH=$current_dir/third-party/openssl-android-1 \ CYRUS_SASL_PATH=$current_dir/third-party/cyrus-sasl-android-1 @@ -73,7 +72,6 @@ download_dep "ctemplate-android" $ctemplate_build_version download_dep "icu4c-android" $icu4c_build_version download_dep "libetpan-android" $libetpan_build_version download_dep "libxml2-android" $libxml2_build_version -download_dep "uchardet-android" $uchardet_build_version download_dep "tidy-html5-android" $tidy_html5_build_version download_dep "openssl-android" $openssl_build_version download_dep "cyrus-sasl-android" $cyrus_sasl_build_version diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index 12294ec5..a7581c99 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -26,7 +26,6 @@ includes = \ $(ICU4C_PATH)/include \ $(LIBETPAN_PATH)/include \ $(LIBXML2_PATH)/include \ - $(UCHARDET_PATH)/include \ $(TIDY_HTML5_PATH)/include \ $(OPENSSL_PATH)/include \ $(ANDROID_NDK)/sources/cxx-stl/llvm-libc++/libcxx/include \ @@ -93,11 +92,6 @@ LOCAL_SRC_FILES := $(LIBXML2_PATH)/libs/$(TARGET_ARCH_ABI)/libxml2.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := uchardet -LOCAL_SRC_FILES := $(UCHARDET_PATH)/libs/$(TARGET_ARCH_ABI)/libuchardet.a -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) LOCAL_MODULE := tidy LOCAL_SRC_FILES := $(TIDY_HTML5_PATH)/libs/$(TARGET_ARCH_ABI)/libtidy.a include $(PREBUILT_STATIC_LIBRARY) @@ -125,5 +119,5 @@ 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_STATIC_LIBRARIES := etpan sasl2 ssl crypto icu4c xml2 uchardet tidy ctemplate +LOCAL_STATIC_LIBRARIES := etpan sasl2 ssl crypto icu4c xml2 tidy ctemplate include $(BUILD_SHARED_LIBRARY) |