Add debug.keystore for use in scripts
Remove special handling of non absolute paths in run_on_as_app.py
Ensure that we authenticate when downloading from internal bucket
Change-Id: Ia7dbf24c8a171fcf062cd2ec2028589feb4386c4
diff --git a/tools/debug.keystore b/tools/debug.keystore
new file mode 100644
index 0000000..7e28347
--- /dev/null
+++ b/tools/debug.keystore
Binary files differ
diff --git a/tools/download_all_benchmark_dependencies.py b/tools/download_all_benchmark_dependencies.py
index 0bfed47..4c72e70 100755
--- a/tools/download_all_benchmark_dependencies.py
+++ b/tools/download_all_benchmark_dependencies.py
@@ -15,7 +15,8 @@
gradle.RunGradle(BUILD_TARGETS)
utils.DownloadFromGoogleCloudStorage(utils.OPENSOURCE_APPS_SHA_FILE)
utils.DownloadFromGoogleCloudStorage(utils.ANDROID_SDK + '.tar.gz.sha1',
- bucket='r8-deps-internal')
+ bucket='r8-deps-internal',
+ auth=True)
if __name__ == '__main__':
sys.exit(Main())
diff --git a/tools/run_on_as_app.py b/tools/run_on_as_app.py
index 2ec05ed..27110e9 100755
--- a/tools/run_on_as_app.py
+++ b/tools/run_on_as_app.py
@@ -988,7 +988,7 @@
action='store_true')
result.add_option('--keystore',
help='Path to app.keystore',
- default='app.keystore')
+ default=os.path.join(utils.TOOLS_DIR, 'debug.keystore'))
result.add_option('--keystore-password', '--keystore_password',
help='Password for app.keystore',
default='android')
@@ -1070,10 +1070,6 @@
def main(argv):
(options, args) = ParseOptions(argv)
- # If the keystore is relative to the repository root, use the full path.
- if os.path.exists(os.path.join(utils.REPO_ROOT, options.keystore)):
- options.keystore = os.path.join(utils.REPO_ROOT, options.keystore)
-
if options.bot:
if os.path.exists(WORKING_DIR):
shutil.rmtree(WORKING_DIR)
diff --git a/tools/utils.py b/tools/utils.py
index d18d722..0b7684d 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -205,11 +205,13 @@
PrintCmd(cmd)
subprocess.check_call(cmd)
-def DownloadFromGoogleCloudStorage(sha1_file, bucket='r8-deps'):
+def DownloadFromGoogleCloudStorage(sha1_file, bucket='r8-deps', auth=False):
suffix = '.bat' if IsWindows() else ''
download_script = 'download_from_google_storage%s' % suffix
- cmd = [download_script, '-n', '-b', bucket, '-u', '-s',
- sha1_file]
+ cmd = [download_script]
+ if not auth:
+ cmd.append('-n')
+ cmd.extend(['-b', bucket, '-u', '-s', sha1_file])
PrintCmd(cmd)
subprocess.check_call(cmd)
