From f47ecbf827cf14a2ff25e2f31da63823fbafc14f Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 2 Nov 2016 17:59:56 +0100
Subject: [PATCH] Fix custom_rules for liblinphone tester

---
 liblinphone_tester/custom_rules.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/liblinphone_tester/custom_rules.xml b/liblinphone_tester/custom_rules.xml
index f72756875..0bc993138 100644
--- a/liblinphone_tester/custom_rules.xml
+++ b/liblinphone_tester/custom_rules.xml
@@ -67,13 +67,22 @@
 		<delete file="${output.file}"/>
 	</target>
 	<target name="check-for-crash" if="has.crashed">
-		<exec executable="bash" >
+         <exec executable="adb" outputproperty="arch">
+            <arg value="shell"/>
+            <arg value="getprop" />
+            <arg value="ro.product.cpu.abi"/>
+        </exec>
+				<exec executable="bash" outputproperty="abi">
+            <arg value="-c"/>
+            <arg value="echo ${arch} | tr -d '\r'"/>
+        </exec>
+        <exec executable="bash" >
 			<arg value="-c" />
 			<arg value="tail -n 500 ${archive.name}" />
 		</exec>
 		<exec executable="bash" >
 			<arg value="-c" />
-			<arg value="cat ${archive.name} |ndk-stack -sym ../libs-debug/`adb shell getprop ro.product.cpu.abi | tr -d '\r'`" />
+            <arg value="cat ${archive.name} |ndk-stack -sym ../libs-debug/${abi}" />
 		</exec>
 		<fail message="Tests crashed" status="125"/>
 	</target>