Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"
This reverts commit 75d3e86468813c450c36d2320bbd7a8b2e2ba9c4.
Android mojo_shell fails to run. It can'd find the
AndroidHandler class. Unclear what part of this change is causing
this. jamesr and I spent a while trying to figure out, but we're
reverting this for now to unblock the rest of the team working
on android development.
Hopefully the paris team will be able to bail us out here when
they wake. :)
R=jamesr@chromium.org,qsr@chromium.org,davemoore@chromium.org
Review URL: https://codereview.chromium.org/951673002
diff --git a/build/download_sdk_extras.py b/build/download_sdk_extras.py
index d22d885..45e7199 100755
--- a/build/download_sdk_extras.py
+++ b/build/download_sdk_extras.py
@@ -9,8 +9,6 @@
bucket named: <dir in SDK extras>_<package name>_<version>.zip. The file will
be extracted in the android_tools/sdk/extras directory on the test bots. This
script will not do anything for developers.
-
-TODO(navabi): Move this script (crbug.com/459819).
"""
import json
@@ -56,13 +54,8 @@
local_zip = '%s/%s' % (SDK_EXTRAS_PATH, package['zip'])
if not os.path.exists(local_zip):
package_zip = '%s/%s' % (SDK_EXTRAS_BUCKET, package['zip'])
- try:
- subprocess.check_call(['python', GSUTIL_PATH, '--force-version', '4.7',
- 'cp', package_zip, local_zip])
- except AccessDeniedException:
- print ('WARNING: Bot does not have permission to download SDK packages.'
- ' If this bot compiles for Android, it may have errors.')
- return 0
+ subprocess.check_call(['python', GSUTIL_PATH, '--force-version', '4.7',
+ 'cp', package_zip, local_zip])
# Always clean dir and extract zip to ensure correct contents.
clean_and_extract(package['dir_name'], package['package'], package['zip'])
