Updated Makefile + ant to sign release apk

This commit is contained in:
Sylvain Berfini 2012-06-01 11:11:44 +02:00
parent ee2677365d
commit a5e0255ebf
2 changed files with 11 additions and 3 deletions

View file

@ -3,6 +3,8 @@ SDK_PATH=$(shell dirname `which android`)
NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo) NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo)
TOPDIR=$(shell pwd) TOPDIR=$(shell pwd)
PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon) 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 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 prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2
generate-libs: 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: update-project:
$(SDK_PATH)/android update project --path . $(SDK_PATH)/android update project --path .
echo "key.store=$(KEYSTORE)" > ant.properties
echo "key.alias=$(KEYALIAS)" >> ant.properties
generate-apk: generate-apk:
ant clean debug ant debug
install-apk: generate-apk install-apk: generate-apk
ant installd ant installd
release: update-project
ant release
run-linphone: run-linphone:
ant run ant run

View file

@ -1066,7 +1066,7 @@
only if release-sign is true (set in -release-check, only if release-sign is true (set in -release-check,
called by -release-no-sign)--> called by -release-no-sign)-->
<target name="release" <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" if="has.keystore"
description="Builds the application. The generated apk file must be signed before description="Builds the application. The generated apk file must be signed before
it is published."> it is published.">