Index: scripts/slave/recipe_modules/chromium_android/api.py |
diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py |
index a36a7305848cbe2ad7b70b79bc350920aeaaed02..5cef8cd259998e74ea0ae5862f9edc3cba8fd716 100644 |
--- a/scripts/slave/recipe_modules/chromium_android/api.py |
+++ b/scripts/slave/recipe_modules/chromium_android/api.py |
@@ -2,6 +2,7 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
+import glob |
import os |
import re |
import urllib |
@@ -358,10 +359,14 @@ class AndroidApi(recipe_api.RecipeApi): |
def provision_devices(self, skip_wipe=False, disable_location=False, |
min_battery_level=None, disable_network=False, |
disable_java_debug=False, reboot_timeout=None, |
- **kwargs): |
+ write_adb_keys_files=True, **kwargs): |
args = ['-t', self.m.chromium.c.BUILD_CONFIG] |
if skip_wipe: |
args.append('--skip-wipe') |
+ if write_adb_keys_files and glob.glob(os.path.join(os.environ['HOME'], |
+ '.android', '*.pub')): |
luqui
2015/03/04 20:19:44
If we told it to write the adb keys file, and ther
friedman1
2015/03/04 20:49:34
Why not just [key for key in os.listdir(os.path.jo
|
+ args.append('--adb-key-files %s' % os.path.join(os.environ['HOME'], |
+ '.android', '*.pub')) |
if disable_location: |
args.append('--disable-location') |
if reboot_timeout is not None: |