[vogar] r281 committed - bin/vogar: people still use both trees with "prebuilt" and trees with ...

[vo...@googlecode.com]

Revision: 281
Author: e...@google.com
Date: Fri Jul 13 14:03:42 2012
Log: bin/vogar: people still use both trees with "prebuilt" and trees
with "prebuilts", so support both.

http://code.google.com/p/vogar/source/detail?r=281

Modified:
/trunk/bin/vogar

=======================================
--- /trunk/bin/vogar Mon Jul 9 13:10:29 2012
+++ /trunk/bin/vogar Fri Jul 13 14:03:42 2012
@@ -6,7 +6,8 @@

if [ -n "${ANDROID_BUILD_TOP}" ]; then
# We're in an Android build tree, so pull the latest sdk from
there.
- android_sdks_dir=${ANDROID_BUILD_TOP}/prebuilt/sdk/
+ # <= ICS uses 'prebuilt', >= JB uses 'prebuilts'.
+ android_sdks_dir=${ANDROID_BUILD_TOP}/prebuilt*/sdk/
latest_android_sdk=`ls -1 ${android_sdks_dir} | sort -n | tail -1`
android_platform_dir=${android_sdks_dir}/${latest_android_sdk}
else