ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-20 09:26:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename libservald to libserval for consistency with android build

Browse Source
This commit is contained in:
Jeremy Lakeman 2014-02-12 14:29:13 +10:30
parent 99fb8b6108
commit a7b43581ce
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@ -46,7 +46,7 @@ LOCAL_SRC_FILES:= $(SERVALD_SRC_FILES) $(SERVAL_BASE)version_servald.c
LOCAL_CFLAGS += $(SERVALD_LOCAL_CFLAGS) -Iserval-dna/nacl/include
LOCAL_LDLIBS := $(SERVALD_LOCAL_LDLIBS)
LOCAL_STATIC_LIBRARIES := $(SERVALD_LOCAL_STATIC_LIBRARIES)
LOCAL_MODULE:= servald
LOCAL_MODULE:= serval
include $(BUILD_SHARED_LIBRARY)
# Build libserval.so wrapper

2
Makefile.in
View File

@ -148,7 +148,7 @@ COPYRIGHT_TOOL := $(call findPATH,sp-copyright-tool)
# This does not build on 64 bit elf platforms as NaCL isn't built with -fPIC
# DOC 20120615
libservald.so: $(OBJS) version.o
libserval.so: $(OBJS) version.o
@echo LINK $@
@$(CC) $(CFLAGS) -Wall -shared -o $@ $(OBJS) version.o $(LDFLAGS)

2
java/org/servalproject/servaldna/ServalDCommand.java
View File

@ -29,7 +29,7 @@ public class ServalDCommand
static
{
System.loadLibrary("servald");
System.loadLibrary("serval");
}
/**

6
testdefs.sh
View File

@ -244,10 +244,10 @@ foreach_instance_with_pidfile() {
}
# Utility function for setting up servald JNI fixtures:
# - check that libservald.so is present
# - set LD_LIBRARY_PATH so that libservald.so can be found
# - check that libserval.so is present
# - set LD_LIBRARY_PATH so that libserval.so can be found
setup_servald_so() {
assert [ -r "$servald_build_root/libservald.so" ]
assert [ -r "$servald_build_root/libserval.so" ]
export LD_LIBRARY_PATH="$servald_build_root"
}