From 3a0867907419a567dd56e7d702f3e6de81382d0e Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 13 Apr 2017 16:52:28 +0200
Subject: [PATCH] Fix liblinphone_tester grants permissions to all apk

---
 liblinphone_tester/Makefile     | 1 +
 liblinphone_tester/build.gradle | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile
index 68cb33105..e020bbc18 100644
--- a/liblinphone_tester/Makefile
+++ b/liblinphone_tester/Makefile
@@ -4,6 +4,7 @@ all: copy-files
 
 run-all-tests: copy-files
 	../gradlew :installDebugAndroidTest && \
+	../gradlew :installDebug && \
 	../gradlew :grantDebugPermissions -i && \
 	../gradlew :connectedAndroidTest -i \
 
diff --git a/liblinphone_tester/build.gradle b/liblinphone_tester/build.gradle
index 51a34bea3..568772314 100644
--- a/liblinphone_tester/build.gradle
+++ b/liblinphone_tester/build.gradle
@@ -88,7 +88,8 @@ android {
 
 // Grant permissions
 android.applicationVariants.all { variant ->
-  def applicationId = "${getPackageName()}.test"
+  def applicationId = getPackageName()
+  def applicationIdtest = "${getPackageName()}.test"
   def adb = android.getAdbExe().toString()
   def variantName = variant.name.capitalize()
   def grantPermissionTask = tasks.create("grant${variantName}Permissions") << {
@@ -99,6 +100,9 @@ android.applicationVariants.all { variant ->
         "${adb} shell pm grant ${applicationId} android.permission.RECORD_AUDIO".execute()
         "${adb} shell pm grant ${applicationId} android.permission.WRITE_EXTERNAL_STORAGE".execute()
         "${adb} shell pm grant ${applicationId} android.permission.CAMERA".execute()
+        "${adb} shell pm grant ${applicationIdtest} android.permission.RECORD_AUDIO".execute()
+        "${adb} shell pm grant ${applicationIdtest} android.permission.WRITE_EXTERNAL_STORAGE".execute()
+        "${adb} shell pm grant ${applicationIdtest} android.permission.CAMERA".execute()
       }
     }
   }