From a5e0255ebf13ac9b957ac890f6c621863a2a6be1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Fri, 1 Jun 2012 11:11:44 +0200
Subject: [PATCH] Updated Makefile + ant to sign release apk

---
 Makefile  | 12 ++++++++++--
 build.xml |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2464974f8..256f3606c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,8 @@ SDK_PATH=$(shell dirname `which android`)
 NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo)
 TOPDIR=$(shell pwd)
 PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
+KEYSTORE=bc-android.keystore
+KEYALIAS=nw8000
 
 all: prepare-sources generate-libs generate-apk install-apk run-linphone
 
@@ -46,17 +48,23 @@ prepare-mediastreamer2:
 prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2
 
 generate-libs: 
-	$(NDK_PATH)/ndk-build -j$(NUMCPUS)
+	$(NDK_PATH)/ndk-build BUILD_SILK=1 -j$(NUMCPUS)
+	rm $(TOPDIR)/libs/armeabi/liblinphone.so
 
 update-project:
 	$(SDK_PATH)/android update project --path .
+	echo "key.store=$(KEYSTORE)" > ant.properties
+	echo "key.alias=$(KEYALIAS)" >> ant.properties
 
 generate-apk:
-	ant clean debug
+	ant debug
 
 install-apk: generate-apk
 	ant installd
 
+release: update-project
+	ant release
+
 run-linphone:
 	ant run
 
diff --git a/build.xml b/build.xml
index f05e229ee..5d36bb5e7 100644
--- a/build.xml
+++ b/build.xml
@@ -1066,7 +1066,7 @@
          only if release-sign is true (set in -release-check,
          called by -release-no-sign)-->
     <target name="release"
-                depends="-set-release-mode, -release-obfuscation-check, -package, -release-prompt-for-password, -release-nosign"
+                depends="clean, init, -set-release-mode, -release-obfuscation-check, -package, -release-prompt-for-password, -release-nosign"
                 if="has.keystore"
                 description="Builds the application. The generated apk file must be signed before
                             it is published.">