| Index: scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Android.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Android.json
|
| similarity index 95%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN__dbg_.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Android.json
|
| index cba4c399238c0d6a8ce3732f05999c3ed53d6e15..9883e113a1d5e16e6e6f6ef4d7b7c09bbae6dbe6 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_linux_Android_GN__dbg_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Android.json
|
| @@ -5,9 +5,9 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| - "chromium.linux",
|
| + "chromium.mojo",
|
| "--builder",
|
| - "Android GN (dbg)",
|
| + "Chromium Mojo Android",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -122,12 +122,11 @@
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| - "Debug",
|
| - "--use-src-side-runtest-py",
|
| + "Release",
|
| "--paths",
|
| "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Android GN (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| + "{\"buildername\": \"Chromium Mojo Android\", \"buildnumber\": 571, \"mastername\": \"chromium.mojo\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| @@ -141,13 +140,13 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/chromium.mojo.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mojo.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -166,8 +165,8 @@
|
| "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/Debug/debug_info_dumps",
|
| - "[SLAVE_BUILD]/src/out/Debug/test_logs",
|
| + "[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"
|
| ],
|
| @@ -206,14 +205,14 @@
|
| "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| - "chromium.linux",
|
| + "chromium.mojo",
|
| "-b",
|
| - "Android GN (dbg)",
|
| + "Chromium Mojo Android",
|
| "--config-file",
|
| "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[BUILD]/goma",
|
| - "//out/Debug"
|
| + "//out/Release"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "generate_build_files"
|
| @@ -224,7 +223,7 @@
|
| "-u",
|
| "[BUILD]/scripts/slave/compile.py",
|
| "--target",
|
| - "Debug",
|
| + "Release",
|
| "--src-dir",
|
| "[SLAVE_BUILD]/src",
|
| "--build-tool",
|
|
|