| OLD | NEW | 
|---|
| 1 [ | 1 [ | 
| 2   { | 2   { | 
| 3     "cmd": [ | 3     "cmd": [ | 
| 4       "python", | 4       "python", | 
| 5       "-u", | 5       "-u", | 
| 6       "[BUILD]/scripts/slave/bot_update.py", | 6       "[BUILD]/scripts/slave/bot_update.py", | 
| 7       "--master", | 7       "--master", | 
| 8       "client.webrtc", | 8       "client.webrtc", | 
| 9       "--builder", | 9       "--builder", | 
| 10       "Android32 GN (dbg)", | 10       "Android32 GN (dbg)", | 
| 11       "--slave", | 11       "--slave", | 
| 12       "slavename", | 12       "slavename", | 
| 13       "--spec", | 13       "--spec", | 
| 14       "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'na
     me': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_
     file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome
     -internal.googlesource.com/chrome/deps/webrtc-limited'}]\ntarget_os = ['android'
     ]", | 14       "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'na
     me': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_
     file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome
     -internal.googlesource.com/chrome/deps/webrtc-limited'}]\ntarget_os = ['android'
     ]", | 
| 15       "--root", | 15       "--root", | 
| 16       "src", | 16       "src", | 
| 17       "--revision_mapping_file", | 17       "--revision_mapping_file", | 
| 18       "{\"src\": \"got_revision\"}", | 18       "{\"src\": \"got_revision\"}", | 
| 19       "--output_json", | 19       "--output_json", | 
| 20       "/path/to/tmp/json", | 20       "/path/to/tmp/json", | 
| 21       "--revision", | 21       "--revision", | 
| 22       "src@12345" | 22       "src@12345" | 
| 23     ], | 23     ], | 
|  | 24     "cwd": "[SLAVE_BUILD]", | 
| 24     "name": "bot_update", | 25     "name": "bot_update", | 
| 25     "~followup_annotations": [ | 26     "~followup_annotations": [ | 
| 26       "@@@STEP_TEXT@Some step text@@@", | 27       "@@@STEP_TEXT@Some step text@@@", | 
| 27       "@@@STEP_LOG_LINE@json.output@{@@@", | 28       "@@@STEP_LOG_LINE@json.output@{@@@", | 
| 28       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@", | 29       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@", | 
| 29       "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@", | 30       "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@", | 
| 30       "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@", | 31       "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@", | 
| 31       "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@", | 32       "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@", | 
| 32       "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"f27fede2220bcd326aee
     3e86ddfd4ebd0fe58cb9\", @@@", | 33       "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"f27fede2220bcd326aee
     3e86ddfd4ebd0fe58cb9\", @@@", | 
| 33       "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master
     @{#170242}\"@@@", | 34       "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master
     @{#170242}\"@@@", | 
| 34       "@@@STEP_LOG_LINE@json.output@  }, @@@", | 35       "@@@STEP_LOG_LINE@json.output@  }, @@@", | 
| 35       "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@", | 36       "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@", | 
| 36       "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@", | 37       "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@", | 
| 37       "@@@STEP_LOG_LINE@json.output@}@@@", | 38       "@@@STEP_LOG_LINE@json.output@}@@@", | 
| 38       "@@@STEP_LOG_END@json.output@@@", | 39       "@@@STEP_LOG_END@json.output@@@", | 
| 39       "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe5
     8cb9\"@@@", | 40       "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe5
     8cb9\"@@@", | 
| 40       "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@" | 41       "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@" | 
| 41     ] | 42     ] | 
| 42   }, | 43   }, | 
| 43   { | 44   { | 
| 44     "cmd": [ | 45     "cmd": [ | 
| 45       "python", | 46       "python", | 
| 46       "-u", | 47       "-u", | 
| 47       "RECIPE_MODULE[webrtc]/resources/cleanup_files.py", | 48       "RECIPE_MODULE[webrtc]/resources/cleanup_files.py", | 
| 48       "[SLAVE_BUILD]/src/out" | 49       "[SLAVE_BUILD]/src/out" | 
| 49     ], | 50     ], | 
|  | 51     "cwd": "[SLAVE_BUILD]", | 
| 50     "name": "clean test output files" | 52     "name": "clean test output files" | 
| 51   }, | 53   }, | 
| 52   { | 54   { | 
| 53     "cmd": [ | 55     "cmd": [ | 
| 54       "python", | 56       "python", | 
| 55       "-u", | 57       "-u", | 
| 56       "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree
     (sys.argv[2], True)\ntry:\n  os.remove(sys.argv[3])\nexcept OSError:\n  pass\nfo
     r base, _dirs, files in os.walk(sys.argv[4]):\n  for f in files:\n    if f.endsw
     ith('.pyc'):\n      os.remove(os.path.join(base, f))\n", | 58       "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree
     (sys.argv[2], True)\ntry:\n  os.remove(sys.argv[3])\nexcept OSError:\n  pass\nfo
     r base, _dirs, files in os.walk(sys.argv[4]):\n  for f in files:\n    if f.endsw
     ith('.pyc'):\n      os.remove(os.path.join(base, f))\n", | 
| 57       "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps", | 59       "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps", | 
| 58       "[SLAVE_BUILD]/src/out/Debug/test_logs", | 60       "[SLAVE_BUILD]/src/out/Debug/test_logs", | 
| 59       "[SLAVE_BUILD]/src/out/build_product.zip", | 61       "[SLAVE_BUILD]/src/out/build_product.zip", | 
| 60       "[SLAVE_BUILD]/src" | 62       "[SLAVE_BUILD]/src" | 
| 61     ], | 63     ], | 
|  | 64     "cwd": "[SLAVE_BUILD]", | 
| 62     "name": "clean local files", | 65     "name": "clean local files", | 
| 63     "~followup_annotations": [ | 66     "~followup_annotations": [ | 
| 64       "@@@STEP_LOG_LINE@python.inline@@@@", | 67       "@@@STEP_LOG_LINE@python.inline@@@@", | 
| 65       "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@", | 68       "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@", | 
| 66       "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@", | 69       "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@", | 
| 67       "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@", | 70       "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@", | 
| 68       "@@@STEP_LOG_LINE@python.inline@try:@@@", | 71       "@@@STEP_LOG_LINE@python.inline@try:@@@", | 
| 69       "@@@STEP_LOG_LINE@python.inline@  os.remove(sys.argv[3])@@@", | 72       "@@@STEP_LOG_LINE@python.inline@  os.remove(sys.argv[3])@@@", | 
| 70       "@@@STEP_LOG_LINE@python.inline@except OSError:@@@", | 73       "@@@STEP_LOG_LINE@python.inline@except OSError:@@@", | 
| 71       "@@@STEP_LOG_LINE@python.inline@  pass@@@", | 74       "@@@STEP_LOG_LINE@python.inline@  pass@@@", | 
| 72       "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv
     [4]):@@@", | 75       "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv
     [4]):@@@", | 
| 73       "@@@STEP_LOG_LINE@python.inline@  for f in files:@@@", | 76       "@@@STEP_LOG_LINE@python.inline@  for f in files:@@@", | 
| 74       "@@@STEP_LOG_LINE@python.inline@    if f.endswith('.pyc'):@@@", | 77       "@@@STEP_LOG_LINE@python.inline@    if f.endswith('.pyc'):@@@", | 
| 75       "@@@STEP_LOG_LINE@python.inline@      os.remove(os.path.join(base, f))@@@"
     , | 78       "@@@STEP_LOG_LINE@python.inline@      os.remove(os.path.join(base, f))@@@"
     , | 
| 76       "@@@STEP_LOG_END@python.inline@@@" | 79       "@@@STEP_LOG_END@python.inline@@@" | 
| 77     ] | 80     ] | 
| 78   }, | 81   }, | 
| 79   { | 82   { | 
| 80     "cmd": [ | 83     "cmd": [ | 
| 81       "python", | 84       "python", | 
| 82       "-u", | 85       "-u", | 
| 83       "[DEPOT_TOOLS]/gclient.py", | 86       "[DEPOT_TOOLS]/gclient.py", | 
| 84       "runhooks" | 87       "runhooks" | 
| 85     ], | 88     ], | 
|  | 89     "cwd": "[SLAVE_BUILD]", | 
| 86     "env": { | 90     "env": { | 
| 87       "GYP_CHROMIUM_NO_ACTION": "1", | 91       "GYP_CHROMIUM_NO_ACTION": "1", | 
| 88       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
     LAVE_BUILD]/src/build/android:%(PATH)s" | 92       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
     LAVE_BUILD]/src/build/android:%(PATH)s" | 
| 89     }, | 93     }, | 
| 90     "name": "gclient runhooks" | 94     "name": "gclient runhooks" | 
| 91   }, | 95   }, | 
| 92   { | 96   { | 
| 93     "cmd": [ | 97     "cmd": [ | 
| 94       "python", | 98       "python", | 
| 95       "-u", | 99       "-u", | 
| 96       "[DEPOT_TOOLS]/gn.py", | 100       "[DEPOT_TOOLS]/gn.py", | 
| 97       "--root=[SLAVE_BUILD]/src", | 101       "--root=[SLAVE_BUILD]/src", | 
| 98       "gen", | 102       "gen", | 
| 99       "//out/Debug", | 103       "//out/Debug", | 
| 100       "--args=is_debug=true target_os=\"android\" target_cpu=\"arm\" use_goma=tr
     ue goma_dir=\"[BUILD]/goma\" build_with_chromium=false" | 104       "--args=is_debug=true target_os=\"android\" target_cpu=\"arm\" use_goma=tr
     ue goma_dir=\"[BUILD]/goma\" build_with_chromium=false" | 
| 101     ], | 105     ], | 
|  | 106     "cwd": "[SLAVE_BUILD]", | 
| 102     "name": "gn" | 107     "name": "gn" | 
| 103   }, | 108   }, | 
| 104   { | 109   { | 
| 105     "cmd": [ | 110     "cmd": [ | 
| 106       "python", | 111       "python", | 
| 107       "-u", | 112       "-u", | 
| 108       "[BUILD]/scripts/slave/compile.py", | 113       "[BUILD]/scripts/slave/compile.py", | 
| 109       "--target", | 114       "--target", | 
| 110       "Debug", | 115       "Debug", | 
| 111       "--src-dir", | 116       "--src-dir", | 
| 112       "[SLAVE_BUILD]/src", | 117       "[SLAVE_BUILD]/src", | 
| 113       "--build-tool", | 118       "--build-tool", | 
| 114       "ninja", | 119       "ninja", | 
| 115       "--compiler", | 120       "--compiler", | 
| 116       "goma", | 121       "goma", | 
| 117       "--goma-dir", | 122       "--goma-dir", | 
| 118       "[BUILD]/goma", | 123       "[BUILD]/goma", | 
| 119       "--", | 124       "--", | 
| 120       "all" | 125       "all" | 
| 121     ], | 126     ], | 
|  | 127     "cwd": "[SLAVE_BUILD]", | 
| 122     "env": { | 128     "env": { | 
| 123       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
     LAVE_BUILD]/src/build/android:%(PATH)s" | 129       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
     LAVE_BUILD]/src/build/android:%(PATH)s" | 
| 124     }, | 130     }, | 
| 125     "name": "compile" | 131     "name": "compile" | 
| 126   } | 132   } | 
| 127 ] | 133 ] | 
| OLD | NEW | 
|---|