Update from https://crrev.com/316786
List of manually-modified files:
gpu/command_buffer/service/in_process_command_buffer.cc
examples/sample_app/BUILD.gn
examples/sample_app/spinning_cube.cc
mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java
mojo/cc/context_provider_mojo.cc
mojo/cc/context_provider_mojo.h
mojo/common/trace_controller_impl.cc
mojo/gles2/command_buffer_client_impl.cc
mojo/gles2/command_buffer_client_impl.h
services/gles2/gpu_impl.cc
shell/android/apk/src/org/chromium/mojo/shell/MojoShellApplication.java
sky/engine/core/dom/Node.cpp
sky/shell/apk/src/org/domokit/sky/shell/SkyShellApplication.java
ui/events/latency_info.cc
ui/gfx/transform.cc
ui/gfx/transform.h
ui/gfx/transform_util.cc
ui/gfx/transform_util.h
Review URL: https://codereview.chromium.org/935333002
diff --git a/build/install-build-deps-android.sh b/build/install-build-deps-android.sh
index 5d95ed5..cf87381 100755
--- a/build/install-build-deps-android.sh
+++ b/build/install-build-deps-android.sh
@@ -4,8 +4,8 @@
# 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
@@ -92,21 +92,9 @@
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."
