From e013d795dea3c56cd694483de7b996810946e041 Mon Sep 17 00:00:00 2001
From: Edouard Tisserant <devnull@localhost>
Date: Sun, 11 Oct 2015 11:42:01 +0200
Subject: [PATCH] Android: forgotten fix for gpg 2.0.x

---
 android/external/Makefile                         | 6 +++---
 android/src/org/pEp/jniadapter/AndroidHelper.java | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/android/external/Makefile b/android/external/Makefile
index 92563d1..435133f 100644
--- a/android/external/Makefile
+++ b/android/external/Makefile
@@ -334,12 +334,12 @@ libiconv/Makefile: libiconv.src.stamp
 				--with-gnu-ld \
 				--prefix=$(LOCAL)
 
-libiconv/lib/.libs/liblibiconv.so: libiconv/Makefile
+libiconv/lib/.libs/libconv.so: libiconv/Makefile
 	$(MAKE) -C libiconv
 
-$(LOCAL)/lib/liblibiconv.so: libiconv/lib/.libs/liblibiconv.so
+$(LOCAL)/lib/libiconv.so: libiconv/lib/.libs/libiconv.so
 	$(MAKE) -C libiconv DESTDIR=$(DESTDIR) prefix=$(prefix) install
-	ls -l $(LOCAL)/lib/liblibiconv.so
+	ls -l $(LOCAL)/lib/libiconv.so
 
 libiconv-build: libiconv/lib/.libs/libiconv.so
 
diff --git a/android/src/org/pEp/jniadapter/AndroidHelper.java b/android/src/org/pEp/jniadapter/AndroidHelper.java
index d78029d..dd6474c 100644
--- a/android/src/org/pEp/jniadapter/AndroidHelper.java
+++ b/android/src/org/pEp/jniadapter/AndroidHelper.java
@@ -145,7 +145,8 @@ public class AndroidHelper {
             already = true;
             assetsSetup(c);
             nativeSetup(c);
-            startDaemonIfNeeded(c);
+            // TODO : remove agent service.
+            //startDaemonIfNeeded(c);
         }
     }