From a383d02cb57dd7dadd382654175e51354073a139 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Thu, 3 Dec 2009 13:50:00 -0800 Subject: Extract emulator major version number from SDK Tools package revision. The minor version number is now always 0, this makes the next version number "5.0" currently in the eclair branch. --- android-configure.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'android-configure.sh') diff --git a/android-configure.sh b/android-configure.sh index 84e4535..26ea251 100755 --- a/android-configure.sh +++ b/android-configure.sh @@ -149,6 +149,15 @@ if [ "$IN_ANDROID_BUILD" = "yes" ] ; then OPTION_TARGETS="$OPTION_TARGETS $HOST_BIN/emulator$EXE" log "Targets : TARGETS=$OPTION_TARGETS" fi + + # find the Android SDK Tools revision number + TOOLS_PROPS=$ANDROID_TOP/sdk/files/tools_source.properties + if [ -f $TOOLS_PROPS ] ; then + ANDROID_SDK_TOOLS_REVISION=`awk -F= '/Pkg.Revision/ { print $2; }' $TOOLS_PROPS 2> /dev/null` + log "Tools : Found tools revision number $ANDROID_SDK_TOOLS_REVISION" + else + log "Tools : Could not locate $TOOLS_PROPS !?" + fi fi # IN_ANDROID_BUILD = no @@ -377,6 +386,9 @@ echo "BUILD_STANDALONE_EMULATOR := true" >> $config_mk if [ $OPTION_DEBUG = yes ] ; then echo "BUILD_DEBUG_EMULATOR := true" >> $config_mk fi +if [ -n "$ANDROID_SDK_TOOLS_REVISION" ] ; then + echo "ANDROID_SDK_TOOLS_REVISION := $ANDROID_SDK_TOOLS_REVISION" >> $config_mk +fi # Build the config-host.h file # -- cgit v1.1