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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: infra/recipes/android/perf.expected/src_side_script_fails.json

Issue 2434403002: Revert of [Android] Always use devil's adb in the perf recipes. (RELAND) (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « infra/recipes/android/perf.expected/provision_devices.json ('k') | infra/recipes/android/perf.expected/test_failure.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra/recipes/android/perf.expected/src_side_script_fails.json
diff --git a/infra/recipes/android/perf.expected/src_side_script_fails.json b/infra/recipes/android/perf.expected/src_side_script_fails.json
index 67d393b609ee071fa4b6d06aa086daf65343f1bf..d07ec95e25322614faafe319f45189191d556df9 100644
--- a/infra/recipes/android/perf.expected/src_side_script_fails.json
+++ b/infra/recipes/android/perf.expected/src_side_script_fails.json
@@ -173,24 +173,6 @@
"cmd": [
"python",
"-u",
- "\nimport sys\nsys.path.append(sys.argv[1])\nfrom devil import devil_env\ndevil_env.config.Initialize()\ndevil_env.config.PrefetchPaths(dependencies=['adb'])\n",
- "[SLAVE_BUILD]/src/third_party/catapult/devil"
- ],
- "name": "initialize devil",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.path.append(sys.argv[1])@@@",
- "@@@STEP_LOG_LINE@python.inline@from devil import devil_env@@@",
- "@@@STEP_LOG_LINE@python.inline@devil_env.config.Initialize()@@@",
- "@@@STEP_LOG_LINE@python.inline@devil_env.config.PrefetchPaths(dependencies=['adb'])@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
@@ -218,7 +200,7 @@
"-u",
"[SLAVE_BUILD]/src/build/symlink.py",
"-f",
- "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"~/adb"
],
"name": "create adb symlink"
@@ -229,7 +211,7 @@
"--",
"[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
"[SLAVE_BUILD]/src/out/logcat",
- "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -249,7 +231,7 @@
"--",
"[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
"--adb-path",
- "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json"
],
@@ -262,7 +244,7 @@
"RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
"--verbose",
"--adb-path",
- "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -278,7 +260,7 @@
"--known-devices-file",
"[HOME]/.android/known_devices.json",
"--adb-path",
- "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"-v",
"--enable-usb-reset"
],
@@ -294,7 +276,7 @@
"-u",
"[SLAVE_BUILD]/src/build/android/provision_devices.py",
"--adb-path",
- "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--output-device-blacklist",
@@ -326,7 +308,7 @@
"--buildbot-path",
"/home/chrome-bot/.adb_device_info",
"--adb-path",
- "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"-v",
"--overwrite-known-devices-files"
],
@@ -448,7 +430,7 @@
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--adb-path",
- "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"--release"
],
"env": {
@@ -638,7 +620,7 @@
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--adb-path",
- "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
],
"env": {
"CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
@@ -695,7 +677,7 @@
"page_cycler.foo",
"--verbose",
"--adb-path",
- "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--enable-platform-mode"
@@ -747,7 +729,7 @@
"perf_test.foo",
"--verbose",
"--adb-path",
- "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"--blacklist-file",
"[SLAVE_BUILD]/src/out/bad_devices.json",
"--enable-platform-mode"
« no previous file with comments | « infra/recipes/android/perf.expected/provision_devices.json ('k') | infra/recipes/android/perf.expected/test_failure.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698