From 4879a1a9410a0af6e0f96a997c5c9d894b50896b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 24 Jul 2014 14:12:48 +0200
Subject: [PATCH] Reworked SDK ant/Makefile targets

---
 Makefile         |  7 ++++---
 custom_rules.xml | 12 ++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index b75b52be3..976115fe0 100644
--- a/Makefile
+++ b/Makefile
@@ -543,12 +543,13 @@ veryclean: clean clean-ffmpeg clean-x264 clean-openh264 clean-vpx
 .PHONY: clean install-apk run-linphone
 
 generate-sdk: generate-apk
-	ant liblinphone-sdk
+	ant liblinphone-android-sdk
 
-linphone-sdk: generate-sdk
+liblinphone-android-sdk: generate-apk
+	ant liblinphone-android-sdk
 
 linphone-android-sdk: generate-apk
-	ant liblinphone-android-sdk
+	ant linphone-android-sdk
 
 mediastreamer2-sdk: update-mediastreamer2-project generate-mediastreamer2-apk
 	@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \
diff --git a/custom_rules.xml b/custom_rules.xml
index 58f881d78..959fb7b12 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -121,7 +121,7 @@
 		</exec>
 	</target>
 
-	<target name="liblinphone-sdk">
+	<target name="liblinphone-android-sdk">
 		<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}">
@@ -132,15 +132,15 @@
 				<include name="j2se/org/linphone/core/*.java"/>
 			</fileset>
 		</jar>
-		<zip destfile="liblinphone-sdk-${version.name}.zip">
+		<zip destfile="liblinphone-android-sdk-${version.name}.zip">
 			<zipfileset dir="libs" prefix="libs" includes="**/*.so" />
 			<zipfileset dir="${out.absolute.dir}" includes="liblinphone.jar" prefix="libs"/>
 		</zip>
 	</target>
 
-	<target name="liblinphone-android-sdk">
+	<target name="linphone-android-sdk">
                 <echo level="info">Creating library output jar file...</echo>
-                <property name="out.library.jar.file" location="${out.absolute.dir}/liblinphone-android.jar" />
+                <property name="out.library.jar.file" location="${out.absolute.dir}/linphone.jar" />
                 <jar destfile="${out.library.jar.file}">
                         <fileset dir="${out.classes.absolute.dir}"
                                 includes="org/linphone/mediastream/**/*.class  org/linphone/core/**/*.class org/linphone/**/*.class"/>
@@ -149,6 +149,10 @@
                                 <include name="j2se/org/linphone/core/*.java"/>
                         </fileset>
                 </jar>
+		<zip destfile="linphone-android-sdk-${version.name}.zip">
+                        <zipfileset dir="libs" prefix="libs" includes="**/*.so" />
+                        <zipfileset dir="${out.absolute.dir}" includes="linphone.jar" prefix="libs"/>
+                </zip>
         </target>
 
 </project>