Allow release from cloudtop instances
Bug: 152284559
Change-Id: Ieb1d492a7f7cf9adecf23247bb652f31181fb141
diff --git a/tools/update_prebuilds_in_android.py b/tools/update_prebuilds_in_android.py
index f3a0923..7addd5f 100755
--- a/tools/update_prebuilds_in_android.py
+++ b/tools/update_prebuilds_in_android.py
@@ -8,12 +8,8 @@
import os
from shutil import copyfile
import sys
-import tempfile
import utils
-import urllib
-
-BUILD_ROOT = "https://storage.googleapis.com/r8-releases/raw/"
-MASTER_BUILD_ROOT = "%smaster/" % BUILD_ROOT
+import archive
JAR_TARGETS_MAP = {
'full': [
@@ -66,8 +62,6 @@
print ('WARNING: Not copying ' + src + ' -> ' + dest +
', as' + dest + ' does not exist already')
-
-
def copy_jar_targets(root, target_root, jar_targets, maps):
srcs = map((lambda t: t[0] + '.jar'), jar_targets)
dests = map((lambda t: t[1] + '.jar'), jar_targets)
@@ -77,19 +71,19 @@
copy_targets(root, target_root, OTHER_TARGETS, OTHER_TARGETS)
def download_hash(root, commit_hash, target):
- url = MASTER_BUILD_ROOT + commit_hash + '/' + target
- download_target(root, url, target)
+ download_target(root, target, commit_hash, 1)
def download_version(root, version, target):
- url = BUILD_ROOT + version + '/' + target
- download_target(root, url, target)
+ download_target(root, target, version, 0)
-def download_target(root, url, target):
+def download_target(root, target, hash_or_version, is_hash):
download_path = os.path.join(root, target)
+ url = archive.GetUploadDestination(
+ hash_or_version,
+ 'r8lib.jar.map',
+ is_hash)
print 'Downloading: ' + url + ' -> ' + download_path
- result = urllib.urlretrieve(url, download_path)
- if 'X-GUploader-Request-Result: success' not in str(result[1]):
- raise IOError('Failed to download ' + url)
+ utils.download_file_from_cloud_storage(url, download_path)
def main_download(hash, maps, targets, target_root, version):
jar_targets = JAR_TARGETS_MAP[targets]
