diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-12-03 16:41:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 16:41:00 -0800 |
| commit | 51e8424b90a592619034f13b162cb5f6d0fee3d0 (patch) | |
| tree | dc50a020295572b4020ea147b0f3999d113ea523 /android-configure.sh | |
| parent | ae4812d7514dbea69f72da2386c573b63f54160b (diff) | |
| parent | dc3dd741551c323bb853782656c0d693db98ecdc (diff) | |
| download | external_qemu-51e8424b90a592619034f13b162cb5f6d0fee3d0.zip external_qemu-51e8424b90a592619034f13b162cb5f6d0fee3d0.tar.gz external_qemu-51e8424b90a592619034f13b162cb5f6d0fee3d0.tar.bz2 | |
am dc3dd741: am a383d02c: Extract emulator major version number from SDK Tools package revision.
Merge commit 'dc3dd741551c323bb853782656c0d693db98ecdc' into eclair-mr2-plus-aosp
* commit 'dc3dd741551c323bb853782656c0d693db98ecdc':
Extract emulator major version number from SDK Tools package revision.
Diffstat (limited to 'android-configure.sh')
| -rwxr-xr-x | android-configure.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/android-configure.sh b/android-configure.sh index 922a0e4..742fe21 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 @@ -385,6 +394,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 # |