Merge pull request #868 from fornwall/android-cleanup

Remove unused Android parts

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.

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

src/android/README.rst

@@ -1,2 +0,0 @@
-The files under this directory tree were copied from android source
-code repository.

src/android/android.c

@@ -1,48 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2013 Tatsuhiro Tsujikawa
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#include <errno.h>
-
-/*
- * 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;
-}