Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(841)

Unified Diff: scripts/slave/recipe_modules/chromium_android/example.expected/device_file_match.json

Issue 2103803002: adb: move known devices file under cache so it works with remote_run (attempt #2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipe_modules/chromium_android/example.expected/device_file_match.json
diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/device_file_match.json b/scripts/slave/recipe_modules/chromium_android/example.expected/device_file_match.json
index 5a8b993c67c26fd498091201de39406fdf3f24a4..e4114fc85ccf66d9bc0eecf8db06e0cb20e86adf 100644
--- a/scripts/slave/recipe_modules/chromium_android/example.expected/device_file_match.json
+++ b/scripts/slave/recipe_modules/chromium_android/example.expected/device_file_match.json
@@ -269,24 +269,6 @@
"name": "authorize_adb_devices"
},
{
- "cmd": [],
- "name": "fix_device_file_format"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILD]/site_config/.known_devices",
- "/path/to/tmp/"
- ],
- "name": "fix_device_file_format.read_device_file",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@file format is compatible@@@"
- ]
- },
- {
"cmd": [
"[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
"--adb-path",
@@ -296,7 +278,7 @@
"--json-output",
"/path/to/tmp/json",
"--known-devices-file",
- "[BUILD]/site_config/.known_devices"
+ "[CACHE]/known_android_devices"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -419,24 +401,6 @@
"name": "provision_devices"
},
{
- "cmd": [],
- "name": "fix_device_file_format (2)"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILD]/site_config/.known_devices",
- "/path/to/tmp/"
- ],
- "name": "fix_device_file_format.read_device_file (2)",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@file format is compatible@@@"
- ]
- },
- {
"cmd": [
"[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
"--adb-path",
@@ -446,7 +410,7 @@
"--json-output",
"/path/to/tmp/json",
"--known-devices-file",
- "[BUILD]/site_config/.known_devices"
+ "[CACHE]/known_android_devices"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

Powered by Google App Engine
This is Rietveld 408576698