diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-12-03 14:11:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 14:11:33 -0800 |
| commit | dc3dd741551c323bb853782656c0d693db98ecdc (patch) | |
| tree | e691a100f4590b63979bdd125ecb798154e46b3f /android-configure.sh | |
| parent | 1c657d4855986fcf9f4df2b592b1d0ca3238defc (diff) | |
| parent | a383d02cb57dd7dadd382654175e51354073a139 (diff) | |
| download | external_qemu-dc3dd741551c323bb853782656c0d693db98ecdc.zip external_qemu-dc3dd741551c323bb853782656c0d693db98ecdc.tar.gz external_qemu-dc3dd741551c323bb853782656c0d693db98ecdc.tar.bz2 | |
am a383d02c: Extract emulator major version number from SDK Tools package revision.
Merge commit 'a383d02cb57dd7dadd382654175e51354073a139' into eclair-mr2
* commit 'a383d02cb57dd7dadd382654175e51354073a139':
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 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 # |