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/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)
