From 50c2581ae63330771d99a253e6c9ce362f2c82a6 Mon Sep 17 00:00:00 2001
From: gardners <paul@servalproject.org>
Date: Thu, 26 Apr 2012 16:38:21 +0930
Subject: [PATCH] Reinstated commandline wrapper and library so that we can
 call it from JAva, but don't waste 700KB on duplicating the contents of the
 library in the command line control executable.

---
 Android.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 7105e8eb..5207294b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -66,7 +66,7 @@ LOCAL_SRC_FILES:= \
 	serval-dna/keyring.c       \
 	serval-dna/vomp.c
 
-LOCAL_MODULE:= dna
+LOCAL_MODULE:= serval
 
 LOCAL_CFLAGS += \
         -DSHELL -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" \
@@ -83,5 +83,13 @@ LOCAL_CFLAGS += \
 
 LOCAL_STATIC_LIBRARIES := sqlite3 nacl
 
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE:= servald
+LOCAL_SRC_FILES:= servalwrap.c
+
 include $(BUILD_EXECUTABLE)
 
+