mirror of
https://github.com/servalproject/serval-dna.git
synced 2024-12-20 05:37:57 +00:00
8325aacc5d
Recent changes such as the Makefile.in overhaul and the introduction of feature-driven linking broke the Android build. This commit fixes the breakage: - detects the presence of gettid() in configure.ac and only defines gettid() in serval.c if HAVE_GETTID is not defined - builds libserval.so not libservald.so on Android, to avoid a conflict on the module name "servald" in Android.mk - renames cli_cleanup() to command_cleanup(), defines it in commandline.h instead of cli.h, and supplies it in android.c - supplies the 'keyring' global in android.c - removes log_stderr.c from the Android build, since it conflicted with log.c
44 lines
1.3 KiB
C
44 lines
1.3 KiB
C
/*
|
|
Copyright (C) 2014 Serval Project Inc.
|
|
Android specific functions that we don't need on other platforms
|
|
|
|
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.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include "debug.h"
|
|
#include "conf.h"
|
|
#include "keyring.h"
|
|
#include "commandline.h"
|
|
|
|
__thread keyring_file *keyring = NULL;
|
|
|
|
// We don't want to call any at_exit functions from the dalvik VM
|
|
void _exit(int status);
|
|
void exit(int status)
|
|
{
|
|
DEBUGF(verbose, "Calling _exit(%d)", status);
|
|
fflush(stdout);
|
|
_exit(status);
|
|
}
|
|
|
|
void command_cleanup()
|
|
{
|
|
// This function is called after every CLI command has finished.
|
|
rhizome_close_db();
|
|
free_subscribers();
|
|
assert(keyring==NULL);
|
|
}
|