| 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       "tryserver.webrtc", | 8       "tryserver.webrtc", | 
| 9       "--builder", | 9       "--builder", | 
| 10       "android_clang", | 10       "android_clang", | 
| 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       "--issue", | 19       "--issue", | 
| 20       "666666", | 20       "666666", | 
| 21       "--patchset", | 21       "--patchset", | 
| 22       "1", | 22       "1", | 
| 23       "--rietveld_server", | 23       "--rietveld_server", | 
| 24       "https://fake.rietveld.url", | 24       "https://fake.rietveld.url", | 
| 25       "--output_json", | 25       "--output_json", | 
| 26       "/path/to/tmp/json", | 26       "/path/to/tmp/json", | 
| 27       "--revision", | 27       "--revision", | 
| 28       "src@12345" | 28       "src@12345" | 
| 29     ], | 29     ], | 
|  | 30     "cwd": "[SLAVE_BUILD]", | 
| 30     "name": "bot_update", | 31     "name": "bot_update", | 
| 31     "~followup_annotations": [ | 32     "~followup_annotations": [ | 
| 32       "@@@STEP_TEXT@Some step text@@@", | 33       "@@@STEP_TEXT@Some step text@@@", | 
| 33       "@@@STEP_LOG_LINE@json.output@{@@@", | 34       "@@@STEP_LOG_LINE@json.output@{@@@", | 
| 34       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@", | 35       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@", | 
| 35       "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@", | 36       "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@", | 
| 36       "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@", | 37       "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@", | 
| 37       "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@", | 38       "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@", | 
| 38       "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"f27fede2220bcd326aee
     3e86ddfd4ebd0fe58cb9\", @@@", | 39       "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"f27fede2220bcd326aee
     3e86ddfd4ebd0fe58cb9\", @@@", | 
| 39       "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master
     @{#170242}\"@@@", | 40       "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master
     @{#170242}\"@@@", | 
| 40       "@@@STEP_LOG_LINE@json.output@  }, @@@", | 41       "@@@STEP_LOG_LINE@json.output@  }, @@@", | 
| 41       "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@", | 42       "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@", | 
| 42       "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@", | 43       "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@", | 
| 43       "@@@STEP_LOG_LINE@json.output@}@@@", | 44       "@@@STEP_LOG_LINE@json.output@}@@@", | 
| 44       "@@@STEP_LOG_END@json.output@@@", | 45       "@@@STEP_LOG_END@json.output@@@", | 
| 45       "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe5
     8cb9\"@@@", | 46       "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe5
     8cb9\"@@@", | 
| 46       "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@" | 47       "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@" | 
| 47     ] | 48     ] | 
| 48   }, | 49   }, | 
| 49   { | 50   { | 
| 50     "cmd": [ | 51     "cmd": [ | 
| 51       "python", | 52       "python", | 
| 52       "-u", | 53       "-u", | 
| 53       "RECIPE_MODULE[webrtc]/resources/cleanup_files.py", | 54       "RECIPE_MODULE[webrtc]/resources/cleanup_files.py", | 
| 54       "[SLAVE_BUILD]/src/out" | 55       "[SLAVE_BUILD]/src/out" | 
| 55     ], | 56     ], | 
|  | 57     "cwd": "[SLAVE_BUILD]", | 
| 56     "name": "clean test output files" | 58     "name": "clean test output files" | 
| 57   }, | 59   }, | 
| 58   { | 60   { | 
| 59     "cmd": [ | 61     "cmd": [ | 
| 60       "python", | 62       "python", | 
| 61       "-u", | 63       "-u", | 
| 62       "\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", | 64       "\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", | 
| 63       "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps", | 65       "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps", | 
| 64       "[SLAVE_BUILD]/src/out/Debug/test_logs", | 66       "[SLAVE_BUILD]/src/out/Debug/test_logs", | 
| 65       "[SLAVE_BUILD]/src/out/build_product.zip", | 67       "[SLAVE_BUILD]/src/out/build_product.zip", | 
| 66       "[SLAVE_BUILD]/src" | 68       "[SLAVE_BUILD]/src" | 
| 67     ], | 69     ], | 
|  | 70     "cwd": "[SLAVE_BUILD]", | 
| 68     "name": "clean local files", | 71     "name": "clean local files", | 
| 69     "~followup_annotations": [ | 72     "~followup_annotations": [ | 
| 70       "@@@STEP_LOG_LINE@python.inline@@@@", | 73       "@@@STEP_LOG_LINE@python.inline@@@@", | 
| 71       "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@", | 74       "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@", | 
| 72       "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@", | 75       "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@", | 
| 73       "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@", | 76       "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@", | 
| 74       "@@@STEP_LOG_LINE@python.inline@try:@@@", | 77       "@@@STEP_LOG_LINE@python.inline@try:@@@", | 
| 75       "@@@STEP_LOG_LINE@python.inline@  os.remove(sys.argv[3])@@@", | 78       "@@@STEP_LOG_LINE@python.inline@  os.remove(sys.argv[3])@@@", | 
| 76       "@@@STEP_LOG_LINE@python.inline@except OSError:@@@", | 79       "@@@STEP_LOG_LINE@python.inline@except OSError:@@@", | 
| 77       "@@@STEP_LOG_LINE@python.inline@  pass@@@", | 80       "@@@STEP_LOG_LINE@python.inline@  pass@@@", | 
| 78       "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv
     [4]):@@@", | 81       "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv
     [4]):@@@", | 
| 79       "@@@STEP_LOG_LINE@python.inline@  for f in files:@@@", | 82       "@@@STEP_LOG_LINE@python.inline@  for f in files:@@@", | 
| 80       "@@@STEP_LOG_LINE@python.inline@    if f.endswith('.pyc'):@@@", | 83       "@@@STEP_LOG_LINE@python.inline@    if f.endswith('.pyc'):@@@", | 
| 81       "@@@STEP_LOG_LINE@python.inline@      os.remove(os.path.join(base, f))@@@"
     , | 84       "@@@STEP_LOG_LINE@python.inline@      os.remove(os.path.join(base, f))@@@"
     , | 
| 82       "@@@STEP_LOG_END@python.inline@@@" | 85       "@@@STEP_LOG_END@python.inline@@@" | 
| 83     ] | 86     ] | 
| 84   }, | 87   }, | 
| 85   { | 88   { | 
| 86     "cmd": [ | 89     "cmd": [ | 
| 87       "python", | 90       "python", | 
| 88       "-u", | 91       "-u", | 
| 89       "[DEPOT_TOOLS]/gclient.py", | 92       "[DEPOT_TOOLS]/gclient.py", | 
| 90       "runhooks" | 93       "runhooks" | 
| 91     ], | 94     ], | 
|  | 95     "cwd": "[SLAVE_BUILD]", | 
| 92     "env": { | 96     "env": { | 
| 93       "GYP_CROSSCOMPILE": "1", | 97       "GYP_CROSSCOMPILE": "1", | 
| 94       "GYP_DEFINES": "OS=android clang=1 component=static_library dcheck_always_
     on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", | 98       "GYP_DEFINES": "OS=android clang=1 component=static_library dcheck_always_
     on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", | 
| 95       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
     LAVE_BUILD]/src/build/android:%(PATH)s" | 99       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
     LAVE_BUILD]/src/build/android:%(PATH)s" | 
| 96     }, | 100     }, | 
| 97     "name": "gclient runhooks" | 101     "name": "gclient runhooks" | 
| 98   }, | 102   }, | 
| 99   { | 103   { | 
| 100     "cmd": [ | 104     "cmd": [ | 
| 101       "python", | 105       "python", | 
| 102       "-u", | 106       "-u", | 
| 103       "[BUILD]/scripts/slave/compile.py", | 107       "[BUILD]/scripts/slave/compile.py", | 
| 104       "--target", | 108       "--target", | 
| 105       "Debug", | 109       "Debug", | 
| 106       "--src-dir", | 110       "--src-dir", | 
| 107       "[SLAVE_BUILD]/src", | 111       "[SLAVE_BUILD]/src", | 
| 108       "--build-tool", | 112       "--build-tool", | 
| 109       "ninja", | 113       "ninja", | 
| 110       "--compiler", | 114       "--compiler", | 
| 111       "goma-clang", | 115       "goma-clang", | 
| 112       "--goma-dir", | 116       "--goma-dir", | 
| 113       "[BUILD]/goma", | 117       "[BUILD]/goma", | 
| 114       "--" | 118       "--" | 
| 115     ], | 119     ], | 
|  | 120     "cwd": "[SLAVE_BUILD]", | 
| 116     "env": { | 121     "env": { | 
| 117       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
     LAVE_BUILD]/src/build/android:%(PATH)s" | 122       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S
     LAVE_BUILD]/src/build/android:%(PATH)s" | 
| 118     }, | 123     }, | 
| 119     "name": "compile" | 124     "name": "compile" | 
| 120   } | 125   } | 
| 121 ] | 126 ] | 
| OLD | NEW | 
|---|