From 49a0e765b1af172f43930643a492fb731acb8730 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 16 Oct 2013 21:37:35 +0200 Subject: [PATCH] fix belle-sip version --- Makefile | 3 ++- project.properties | 2 +- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c9ee5c8ee..6e76f2774 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,8 @@ NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" ) TOPDIR=$(shell pwd) LINPHONE_VERSION=$(shell cd submodules/linphone && git describe --always) LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe --always) -BELLESIP_VERSION=$(shell cat submodules/belle-sip/VERSION) +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) SQLITE_VERSION=3071700 SQLITE_BASENAME=sqlite-amalgamation-$(SQLITE_VERSION) diff --git a/project.properties b/project.properties index a2bff5858..019cc5583 100644 --- a/project.properties +++ b/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-18 +target=android-17 android.library=false diff --git a/submodules/belle-sip b/submodules/belle-sip index a0b22b83b..225f9e3d9 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit a0b22b83b56385234d1facfd9fbd4a2a961668f2 +Subproject commit 225f9e3d913290b599c3ff96547c01ac6abb4f77 diff --git a/submodules/linphone b/submodules/linphone index 0e9de476d..107fb22c0 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 0e9de476d131cf2e2a39bf6bdf686a451e04d876 +Subproject commit 107fb22c07a2372cdaf4d02687d828ec8f044170