From 1de819e33a58114e6226ac3415dec50728dbec55 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 23 Feb 2017 11:04:48 +0100
Subject: [PATCH] Fix liblinphone and linphone tester

---
 custom_rules.xml   | 2 +-
 default.properties | 2 +-
 prepare.py         | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/custom_rules.xml b/custom_rules.xml
index 27e5e6956..d165e7074 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -73,7 +73,7 @@
 		<echo level="info">Creating library output jar file...</echo>
 		<property name="out.library.jar.file" location="${out.absolute.dir}/liblinphone.jar" />
 		<jar destfile="${out.library.jar.file}">
-			<fileset dir="${out.classes.absolute.dir}"
+			<fileset dir="bin/intermediates/classes/debug"
 				includes="org/linphone/mediastream/**/*.class  org/linphone/core/**/*.class org/linphone/tools/**/*.class"/>
 			<fileset dir="submodules/linphone/java" >
 				<include name="common/org/linphone/core/*.java"/>
diff --git a/default.properties b/default.properties
index 1b6883087..2f4f19c69 100644
--- a/default.properties
+++ b/default.properties
@@ -1 +1 @@
-version.name=""
+version.name=3.2.2-97-gf7378dac
diff --git a/prepare.py b/prepare.py
index 6de8ab003..c2900fb1f 100755
--- a/prepare.py
+++ b/prepare.py
@@ -216,6 +216,9 @@ install: install-apk run-linphone
 java-clean:
 \tgradle clean
 
+ant-clean:
+\tant clean
+
 $(TOPDIR)/res/raw/rootca.pem:
 \tcp liblinphone-sdk/android-{first_arch}/share/linphone/rootca.pem $@
 
@@ -309,7 +312,7 @@ generate-apk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem update-pro
 \techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\
 \tgradle assembleDebug
 
-generate-mediastreamer2-apk: java-clean build copy-libs update-mediastreamer2-project
+generate-mediastreamer2-apk: ant-clean build copy-libs update-mediastreamer2-project
 \t@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \\
 \techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\
 \tant debug