mirror of
https://github.com/servalproject/serval-dna.git
synced 2024-12-21 14:07:53 +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
50 lines
1.4 KiB
C
50 lines
1.4 KiB
C
/*
|
|
Serval DNA - executable wrapper around shared library
|
|
Copyright 2010-2012 Paul Gardner-Stephen
|
|
Copyright 2012-2013 Serval Project Inc.
|
|
Copyright 2016 Flinders University
|
|
|
|
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 <dlfcn.h>
|
|
#include <stdio.h>
|
|
|
|
int main(int argc,char **argv)
|
|
{
|
|
const char *libservald_path =
|
|
#ifdef ANDROID
|
|
"/data/data/org.servalproject/lib/libserval.so"
|
|
#else
|
|
"libservald.so"
|
|
#endif
|
|
;
|
|
const char *entry_point ="servald_main";
|
|
|
|
void *h = dlopen(libservald_path, RTLD_LAZY);
|
|
if (!h) {
|
|
fprintf(stderr, "%s\n", dlerror());
|
|
return 1;
|
|
}
|
|
|
|
int (*servald_main)(int, char **) = dlsym(h, entry_point);
|
|
if (!servald_main) {
|
|
fprintf(stderr, "Could not resolve %s in %s\n", entry_point, libservald_path);
|
|
return 1;
|
|
}
|
|
|
|
return (*servald_main)(argc, argv);
|
|
}
|