diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2017-03-19 18:02:35 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-19 18:02:35 +0900 |
| commit | f0adbde2e6bd46eef13367dc564524c70c0c3916 (patch) | |
| tree | 4412d87e4c3458afece30e6af617a106d824b1bd /src | |
| parent | 7db393ec3dca29c905e9fe257a8756879be692f6 (diff) | |
| parent | 68edbb358c49d9a4aa7690b14dc904a0fc166844 (diff) | |
Merge pull request #868 from fornwall/android-cleanup
Remove unused Android parts
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/android/README.rst | 2 | ||||
| -rw-r--r-- | src/android/android.c | 48 |
3 files changed, 0 insertions, 54 deletions
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 @@ -/* <!-- 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; -} |
