Android build fixes.

build/install-build-deps-android.sh

Index: build/install-build-deps-android.sh
diff --git a/build/install-build-deps-android.sh b/build/install-build-deps-android.sh
index db935224211b0a3ba0ac75dafbc7c3b840b0362c..1e82fe8e3248a7285b3d71a59234b40aa4b12ac5 100755
--- a/build/install-build-deps-android.sh
+++ b/build/install-build-deps-android.sh
@@ -102,8 +102,19 @@ if [[ ! $("${ANDROID_SDK_ROOT}/tools/android" list targets \
   # From current configuration, all android platforms will be installed.
   # This will take a little bit long time.
   echo "Install platform, platform-tool and tool ..."
-  "${ANDROID_SDK_ROOT}"/tools/android update sdk --no-ui \
-    --filter platform,platform-tool,tool
+
+  # This needs to be called twice.  The first time, "android" itself
+  # references
+  # https://dl-ssl.google.com/android/repository/addons_list.xml,
+  # which no longer exists.  On the second run, "android" (or one of
+  # it's config files) has been updated to now reference curl
+  # https://dl-ssl.google.com/android/repository/addons_list-1.xml,
+  # which contains what we need.
+  for try in 1 2 ; do
+    echo "==== SDK update $try"
+    "${ANDROID_SDK_ROOT}"/tools/android update sdk --no-ui \
+      --filter platform,platform-tool,tool
+  done

[michaelbai, 2011/10/31 20:06:17]

What about upgrade to Android 4.0 SDK, which might fix this issue.

[John Grabowski, 2011/10/31 20:54:48]

That's a good idea; lets do that as follow-up

 fi
 
 # Create a Android Virtual Device named 'buildbot' with default hardware