From ddfd0102ab4e6e871adf8e5487a1b6830b4f104d Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 23 Feb 2017 17:21:05 +0100
Subject: [PATCH] Fix liblinphone_tester

---
 liblinphone_tester/AndroidManifest.xml | 16 ++++----
 liblinphone_tester/Makefile            |  8 ++--
 liblinphone_tester/build.gradle        | 51 ++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 12 deletions(-)
 create mode 100644 liblinphone_tester/build.gradle

diff --git a/liblinphone_tester/AndroidManifest.xml b/liblinphone_tester/AndroidManifest.xml
index 0bf9ab62a..6c8623f2c 100644
--- a/liblinphone_tester/AndroidManifest.xml
+++ b/liblinphone_tester/AndroidManifest.xml
@@ -5,11 +5,11 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
-    
-    <instrumentation 
-        android:targetPackage="org.linphone.tester" 
+        android:minSdkVersion="14"
+        android:targetSdkVersion="23" />
+
+    <instrumentation
+        android:targetPackage="org.linphone.tester"
         android:name="org.linphone.tester.TestRunner" />
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -47,8 +47,8 @@
             android:screenOrientation="nosensor"
             android:launchMode="singleTask">
         </activity>
-        
+
         <uses-library android:name="android.test.runner" />
-            
+
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile
index 957a339fe..372e0ecae 100644
--- a/liblinphone_tester/Makefile
+++ b/liblinphone_tester/Makefile
@@ -2,10 +2,9 @@ ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep -E 'android-[0-
 SDK_PLATFORM_TOOLS_PATH=$(shell dirname `which adb`)
 
 all: update-project copy-files
-	ant clean debug
-	$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone.tester
-	$(SDK_PLATFORM_TOOLS_PATH)/adb install -g bin/liblinphone_tester-debug.apk
-	#$(SDK_PLATFORM_TOOLS_PATH)/adb install -g ../bin/Linphone-debug.apk
+	gradle clean
+	gradle uninstallDebug
+	gradle installDebug
 
 run-all-tests: all
 	ant test
@@ -64,3 +63,4 @@ copy-files: ../submodules/linphone/tester/tester_hosts ../submodules/linphone/te
 	cp -rf ../submodules/linphone/tester/rcfiles assets/config_files
 	cp -rf ../submodules/linphone/tester/sounds assets/config_files
 	cp -rf ../submodules/linphone/tester/vcards assets/config_files
+	cp ../google-services.json .
diff --git a/liblinphone_tester/build.gradle b/liblinphone_tester/build.gradle
new file mode 100644
index 000000000..94f896041
--- /dev/null
+++ b/liblinphone_tester/build.gradle
@@ -0,0 +1,51 @@
+// Project information
+buildDir = 'bin'
+ext.linphonePackageName = "org.linphone.tester"
+
+buildscript {
+  repositories {
+    jcenter()
+    mavenCentral()
+    mavenLocal()
+  }
+  dependencies {
+    classpath 'com.android.tools.build:gradle:2.2.0'
+    classpath 'com.google.gms:google-services:3.0.0'
+  }
+}
+apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
+
+dependencies {
+  compile fileTree(dir: 'libs', include: '*.jar')
+  compile 'com.google.firebase:firebase-messaging:9.0.0'
+}
+
+android {
+  defaultConfig {
+    compileSdkVersion 23
+    buildToolsVersion "25.0.2"
+    applicationId "org.linphone.tester"
+    multiDexEnabled true
+  }
+
+  sourceSets {
+    main {
+      manifest.srcFile 'AndroidManifest.xml'
+      java.srcDirs = ['../submodules/linphone/mediastreamer2/java/src','../submodules/linphone/java/j2se','../submodules/linphone/java/common','../submodules/linphone/java/impl','../submodules/externals/axmlrpc/src/main/java','../submodules/linphone/coreapi/help/java','src']
+      resources.srcDirs = ['../submodules/linphone/mediastreamer2/java/src','../submodules/linphone/java/j2se','../submodules/linphone/java/common','../submodules/linphone/java/impl','../submodules/externals/axmlrpc/src/main/java','../submodules/linphone/coreapi/help/java','src']
+      aidl.srcDirs = ['../submodules/linphone/mediastreamer2/java/src','../submodules/linphone/java/j2se','../submodules/linphone/java/common','../submodules/linphone/java/impl','../submodules/externals/axmlrpc/src/main/java','../submodules/linphone/coreapi/help/java','src']
+      renderscript.srcDirs = ['../submodules/linphone/mediastreamer2/java/src','../submodules/linphone/java/j2se','../submodules/linphone/java/common','../submodules/linphone/java/impl','../submodules/externals/axmlrpc/src/main/java','../submodules/linphone/coreapi/help/java','src']
+      res.srcDirs = ['res']
+      assets.srcDirs = ['assets']
+      jniLibs.srcDir 'libs'
+    }
+  }
+
+  lintOptions {
+    checkReleaseBuilds false
+    // Or, if you prefer, you can continue to check for errors in release builds,
+    // but continue the build even when errors are found:
+    abortOnError false
+  }
+}