diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 23:25:47 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 23:25:47 +0000 |
| commit | 58b0fd6743c7ea11057eefe7b63ace3079ff2cc4 (patch) | |
| tree | ba02843c890bad67297c6575ccf4a1fc43d1a335 /build | |
| parent | 645b3134f5411fe0e2e294a05dd20e74e2aeb6b7 (diff) | |
| download | chromium_src-58b0fd6743c7ea11057eefe7b63ace3079ff2cc4.zip chromium_src-58b0fd6743c7ea11057eefe7b63ace3079ff2cc4.tar.gz chromium_src-58b0fd6743c7ea11057eefe7b63ace3079ff2cc4.tar.bz2 | |
Update android install build deps for virgin run.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8438010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/install-build-deps-android.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/build/install-build-deps-android.sh b/build/install-build-deps-android.sh index db93522..1e82fe8 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 fi # Create a Android Virtual Device named 'buildbot' with default hardware |