From 6b0d14614e4c6e24cc9282170a23a64e05878fbf Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Tue, 4 Apr 2017 16:12:37 +0200
Subject: [PATCH] Fix liblinphone_tester

---
 liblinphone_tester/Makefile     | 5 ++---
 liblinphone_tester/build.gradle | 5 +----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile
index a40a04c7f..41da77c4c 100644
--- a/liblinphone_tester/Makefile
+++ b/liblinphone_tester/Makefile
@@ -2,9 +2,8 @@ all: copy-files
 	../gradlew clean
 	../gradlew uninstallDebug
 
-run-all-tests: all
-	../gradlew installDebug
-	$(shell adb shell am instrument -r -w org.linphone.tester/org.linphone.tester.TestRunner | tee report.txt)
+run-all-tests:
+	../gradlew :connectedAndroidTest
 
 copy-libs:
 	rm -rf libs/arm64-v8a
diff --git a/liblinphone_tester/build.gradle b/liblinphone_tester/build.gradle
index 743932378..a7570183b 100644
--- a/liblinphone_tester/build.gradle
+++ b/liblinphone_tester/build.gradle
@@ -21,7 +21,7 @@ apply plugin: 'com.android.application'
 dependencies {
   compile project(":libLinphoneAndroidSdk")
   compile fileTree(dir: 'libs', include: '*.jar')
-  androidTestCompile project(":libLinphoneAndroidSdk")
+  //androidTestCompile project(":libLinphoneAndroidSdk")
   androidTestCompile fileTree(dir: 'libs', include: '*.jar')
 }
 
@@ -31,9 +31,6 @@ android {
     buildToolsVersion "25.0.2"
     applicationId getPackageName()
     multiDexEnabled true
-    ndk {
-      ldLibs "log"
-    }
   }
 
   sourceSets {