From 9cb418b0094ae70ac9a3c6c509e83314f61711a3 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 17 Nov 2014 15:26:23 +0100 Subject: [PATCH] Improved Makefile to not take android-21 target if it's the most recent (it will take the second most recent one) --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4b585126d..5d4df6e5d 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,9 @@ LIBLINPHONE_VERSION=$(shell cd submodules/linphone && git describe --always) LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe --always) BELLESIP_VERSION_SCRIPT:=cat submodules/belle-sip/configure.ac | grep "AC_INIT(" | sed -e "s/.*belle-sip\]//" | sed -e "s/].*//" | sed -e "s/.*\[//" BELLESIP_VERSION=$(shell $(BELLESIP_VERSION_SCRIPT)) -ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1) -#ANDROID_MOST_RECENT_TARGET=android-19 +MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1) +SECOND_MOST_RECENT_TARGET=$(shell android list target -c | grep android | sed -e '1{$$q;}' -e '$$!{h;d;}' -e x) +ANDROID_MOST_RECENT_TARGET=$(shell test $(MOST_RECENT_TARGET) = "android-21" && echo $(SECOND_MOST_RECENT_TARGET) || echo $(MOST_RECENT_TARGET)) SQLITE_VERSION=3071700 SQLITE_BASENAME=sqlite-amalgamation-$(SQLITE_VERSION) SQLITE_URL=http://www.sqlite.org/2013/$(SQLITE_BASENAME).zip