diff --git a/configure.ac b/configure.ac index 63880210..daee733c 100644 --- a/configure.ac +++ b/configure.ac @@ -1099,31 +1099,6 @@ AM_CONDITIONAL([ENABLE_LIBARIA2], [test "x$enable_libaria2" = "xyes"]) AC_SUBST([bashcompletiondir]) -case "$host" in - *android*) - android=yes - LIBS="$LIBS -lstdc++ -lsupc++" - case "$host" in - arm-*) - android_arm=yes - ;; - mipsel-*) - android_mips=yes - ;; - i686-*) - android_x86=yes - ;; - esac - ;; - *) - ;; -esac - -AM_CONDITIONAL([ANDROID], [test "x$android" = "xyes"]) -AM_CONDITIONAL([ANDROID_ARM], [test "x$android_arm" = "xyes"]) -AM_CONDITIONAL([ANDROID_MIPS], [test "x$android_mips" = "xyes"]) -AM_CONDITIONAL([ANDROID_X86], [test "x$android_x86" = "xyes"]) - if test "x$ARIA2_STATIC" = "xyes"; then # -static-libgcc and -static-libstdc++ are linker flags and not for # libtool. diff --git a/src/Makefile.am b/src/Makefile.am index 9322112c..d61fa509 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -273,10 +273,6 @@ SRCS = \ EvictSocketPoolCommand.cc EvictSocketPoolCommand.h\ libssl_compat.h -if ANDROID -SRCS += android/android.c -endif # ANDROID - if MINGW_BUILD SRCS += WinConsoleFile.cc WinConsoleFile.h endif # MINGW_BUILD diff --git a/src/android/README.rst b/src/android/README.rst deleted file mode 100644 index b9adab1e..00000000 --- a/src/android/README.rst +++ /dev/null @@ -1,2 +0,0 @@ -The files under this directory tree were copied from android source -code repository. diff --git a/src/android/android.c b/src/android/android.c deleted file mode 100644 index 73ac29b2..00000000 --- a/src/android/android.c +++ /dev/null @@ -1,48 +0,0 @@ -/* */ -#include - -/* - * Since Android ndk r9, __set_errno is deprecated. It is now defined - * as inline function in errno.h. The syscall assembly calls - * __set_errno, but since libc.so does not export it, the link - * fails. To workaround this, replace all occurrences of __set_errno - * with a2_set_errno and define it here. - */ -int a2_set_errno(int n) -{ - errno = n; - return -1; -}