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

Unified Diff: scripts/slave/recipes/cronet.expected/android_cronet_builder_asan.json

Issue 2174883002: [Android] Root devices before asan_device_setup.sh. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 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/recipes/cronet.expected/android_cronet_builder_asan.json
diff --git a/scripts/slave/recipes/cronet.expected/android_cronet_builder_asan.json b/scripts/slave/recipes/cronet.expected/android_cronet_builder_asan.json
index 8c1340117ef9883e18ef747c615c917ad428ada2..e794937ee844043f6b073bb7a53d0e0145cf2dfd 100644
--- a/scripts/slave/recipes/cronet.expected/android_cronet_builder_asan.json
+++ b/scripts/slave/recipes/cronet.expected/android_cronet_builder_asan.json
@@ -529,6 +529,50 @@
]
},
{
+ "cmd": [],
+ "name": "Set up ASAN on devices"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[build::adb]/resources/list_devices.py",
+ "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
+ "/path/to/tmp/json"
+ ],
+ "name": "Set up ASAN on devices.List adb devices",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@[@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C009\"@@@",
+ "@@@STEP_LOG_LINE@json.output@]@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sys.argv[2:]:\n print 'Attempting to root device %s ...' % (device)\n subprocess.check_call([adb_path, '-s', device, 'root'])\n subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])\n print 'Finished rooting device %s' % (device)\n",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "014E1F310401C009"
+ ],
+ "name": "Set up ASAN on devices.Root devices",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@adb_path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@for device in sys.argv[2:]:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Attempting to root device %s ...' % (device)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', device, 'root'])@@@",
+ "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Finished rooting device %s' % (device)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
"cmd": [
"[SLAVE_BUILD]/src/tools/android/asan/third_party/asan_device_setup.sh",
"--lib",
@@ -541,7 +585,10 @@
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "Set up ASAN on device 07a00ca4"
+ "name": "Set up ASAN on devices.07a00ca4",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [
@@ -726,6 +773,10 @@
"name": "stack_tool_for_asan"
},
{
+ "cmd": [],
+ "name": "Tear down ASAN on devices"
+ },
+ {
"cmd": [
"[SLAVE_BUILD]/src/tools/android/asan/third_party/asan_device_setup.sh",
"--revert",
@@ -737,7 +788,10 @@
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
- "name": "Tear down ASAN on device 07a00ca4"
+ "name": "Tear down ASAN on devices.07a00ca4",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
},
{
"cmd": [

Powered by Google App Engine
This is Rietveld 408576698