Index: scripts/slave/recipes/webrtc/android_apk.expected/client_webrtc_Android_Chromium_APK_Builder_forced.json |
diff --git a/scripts/slave/recipes/webrtc/android_apk.expected/client_webrtc_Android_Chromium_APK_Builder_forced.json b/scripts/slave/recipes/webrtc/android_apk.expected/client_webrtc_Android_Chromium_APK_Builder_forced.json |
deleted file mode 100644 |
index 25f2faebdcf9d87d9310e537cf1f5446cdf48dab..0000000000000000000000000000000000000000 |
--- a/scripts/slave/recipes/webrtc/android_apk.expected/client_webrtc_Android_Chromium_APK_Builder_forced.json |
+++ /dev/null |
@@ -1,172 +0,0 @@ |
-[ |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[BUILD]/scripts/slave/bot_update.py", |
- "--master", |
- "client.webrtc", |
- "--builder", |
- "Android Chromium-APK Builder", |
- "--slave", |
- "fake_slavename", |
- "--spec", |
- "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk', 'webrtc_revision': 'HEAD'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/webrtc-limited'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc.DEPS', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/deps/third_party/webrtc/webrtc.DEPS'}]\ntarget_os = ['android']", |
- "--revision_mapping_file", |
- "{\"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}", |
- "--output_json", |
- "/path/to/tmp/json", |
- "--revision", |
- "src@HEAD", |
- "--revision", |
- "src/third_party/libjingle/source/talk@HEAD", |
- "--revision", |
- "src/third_party/webrtc@HEAD" |
- ], |
- "name": "bot_update (without patch)", |
- "~followup_annotations": [ |
- "@@@STEP_TEXT@Some step text@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": 274981, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_git\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": 120644, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_git\": \"0f90628433546e61d9268596da93418c623137f4\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": 276089, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_git\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": 43426, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_git\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision\": 124383, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision_git\": \"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }, @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@", |
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@", |
- "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@", |
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@", |
- "@@@SET_BUILD_PROPERTY@got_revision@120644@@@", |
- "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@", |
- "@@@SET_BUILD_PROPERTY@got_nacl_revision_git@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@", |
- "@@@SET_BUILD_PROPERTY@got_webkit_revision_git@\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@", |
- "@@@SET_BUILD_PROPERTY@got_v8_revision_git@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@", |
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_git@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@", |
- "@@@SET_BUILD_PROPERTY@got_revision_git@\"0f90628433546e61d9268596da93418c623137f4\"@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "\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\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n", |
- "[SLAVE_BUILD]/src/out/Release/debug_info_dumps", |
- "[SLAVE_BUILD]/src/out/Release/test_logs", |
- "[SLAVE_BUILD]/src/out/build_product.zip", |
- "[SLAVE_BUILD]/src" |
- ], |
- "name": "clean local files", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@python.inline@@@@", |
- "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@", |
- "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@", |
- "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@", |
- "@@@STEP_LOG_LINE@python.inline@try:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@", |
- "@@@STEP_LOG_LINE@python.inline@except OSError:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ pass@@@", |
- "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[4]):@@@", |
- "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@", |
- "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@", |
- "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@", |
- "@@@STEP_LOG_END@python.inline@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[BUILD]/scripts/slave/env_dump.py", |
- "--output-json", |
- "/path/to/tmp/json", |
- "[SLAVE_BUILD]/src/build/android/envsetup.sh" |
- ], |
- "name": "envsetup", |
- "~followup_annotations": [ |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"FOO\": \"bar\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"my_new_gyp_def=aaa\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[DEPOT_TOOLS]/gclient.py", |
- "runhooks" |
- ], |
- "env": { |
- "FOO": "bar", |
- "GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1", |
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc" |
- }, |
- "name": "gclient runhooks" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[BUILD]/scripts/slave/cleanup_temp.py" |
- ], |
- "name": "cleanup_temp" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "[BUILD]/scripts/slave/compile.py", |
- "--target", |
- "Release", |
- "--src-dir", |
- "[SLAVE_BUILD]/src", |
- "--build-tool", |
- "ninja", |
- "--compiler", |
- "goma", |
- "--goma-dir", |
- "[BUILD]/goma", |
- "--", |
- "android_builder_webrtc" |
- ], |
- "env": { |
- "FOO": "bar", |
- "GYP_CROSSCOMPILE": "1", |
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' include_tests=1 target_arch=arm use_goma=1", |
- "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc" |
- }, |
- "name": "compile" |
- }, |
- { |
- "allow_subannotations": true, |
- "cmd": [ |
- "python", |
- "-u", |
- "[BUILD]/scripts/slave/zip_build.py", |
- "--target", |
- "Release", |
- "--build-url", |
- "gs://chromium-webrtc/android_rel", |
- "--build_revision", |
- "120644", |
- "--factory-properties", |
- "{\"BUILD_CONFIG\": \"Release\", \"TARGET_ARCH\": \"arm\", \"TARGET_BITS\": 32, \"TARGET_PLATFORM\": \"android\", \"buildername\": \"Android Chromium-APK Builder\", \"mastername\": \"client.webrtc\", \"parent_buildername\": null, \"recipe\": \"webrtc/android_apk\", \"slavename\": \"fake_slavename\"}", |
- "--build-properties", |
- "{\"BUILD_CONFIG\": \"Release\", \"TARGET_ARCH\": \"arm\", \"TARGET_BITS\": 32, \"TARGET_PLATFORM\": \"android\", \"buildername\": \"Android Chromium-APK Builder\", \"mastername\": \"client.webrtc\", \"parent_buildername\": null, \"recipe\": \"webrtc/android_apk\", \"slavename\": \"fake_slavename\"}" |
- ], |
- "name": "package build" |
- } |
-] |