Split installation of system packages and user SDKs.

build/install-build-deps-android.sh

 #!/bin/bash -e
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Script to install everything needed to build chromium on android that
-# requires sudo privileges.
+# Script to install everything needed to build chromium on android, including
+# items requiring sudo privileges.
 # See http://code.google.com/p/chromium/wiki/AndroidBuildInstructions
 
 # This script installs the sun-java6 packages (bin, jre and jdk). Sun requires
 # a license agreement, so upon installation it will prompt the user. To get
 # past the curses-based dialog press TAB <ret> TAB <ret> to agree.
 
 args="$@"
 if test "$1" = "--skip-sdk-packages"; then
   skip_inst_sdk_packages=1
   args="${@:2}"
@@ skipping 66 matching lines @@
   if grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out \
       >& /dev/null
   then
     # If there are non-javaplugin.so errors, treat as errors and exit
     echo 'ERRORS: Failed to update alternatives for java-6-sun:'
     grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out
     exit 1
   fi
 fi
 
+# Install SDK packages for android
 if test "$skip_inst_sdk_packages" != 1; then
-  echo 'checking for sdk packages install'
-  # Use absolute path to call 'android' so script can be run from any directory.
-  cwd=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-  # Get the SDK extras packages to install from the DEPS file 'sdkextras' hook.
-  packages="$(python ${cwd}/get_sdk_extras_packages.py)"
-  for package in "${packages}"; do
-    pkg_id=$(${cwd}/../third_party/android_tools/sdk/tools/android list sdk | \
-                  grep -i "$package," | \
-                  awk '/^[ ]*[0-9]*- / {gsub("-",""); print $1}')
-    if [[ -n ${pkg_id} ]]; then
-      ${cwd}/../third_party/android_tools/sdk/tools/android update sdk --no-ui \
-         --filter ${pkg_id}
-    fi
-  done
+  "$(dirname "${BASH_SOURCE[0]}")/install-android-sdks.sh"
 fi
 
 echo "install-build-deps-android.sh complete."