| Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release__gn_.json
|
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release__gn_.json
|
| similarity index 85%
|
| copy from scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release.json
|
| copy to scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release__gn_.json
|
| index c5b6d4c9a6b26e2ea45bc67215e807958347100e..7b368b60b90da714f0726d592958fd60c575b61e 100644
|
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_mac64_release__gn_.json
|
| @@ -7,7 +7,7 @@
|
| "--master",
|
| "client.libyuv",
|
| "--builder",
|
| - "Mac64 Release",
|
| + "Mac64 Release (GN)",
|
| "--slave",
|
| "slavename",
|
| "--spec",
|
| @@ -56,12 +56,26 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| + "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[DEPOT_TOOLS]/gn.py",
|
| + "--root=[SLAVE_BUILD]/src",
|
| + "gen",
|
| + "//out/Release",
|
| + "--args=is_debug=false target_cpu=\"x64\" use_goma=true goma_dir=\"[BUILD]/goma\""
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "gn"
|
| + },
|
| + {
|
| "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| @@ -106,7 +120,7 @@
|
| "--goma-dir",
|
| "[BUILD]/goma",
|
| "--",
|
| - "All"
|
| + "all"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "compile",
|
| @@ -123,11 +137,11 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Mac64 Release\", \"mastername\": \"client.libyuv\", \"recipe\": \"libyuv/libyuv\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Mac64 Release (GN)\", \"mastername\": \"client.libyuv\", \"recipe\": \"libyuv/libyuv\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Mac64 Release\", \"mastername\": \"client.libyuv\", \"recipe\": \"libyuv/libyuv\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Mac64 Release (GN)\", \"mastername\": \"client.libyuv\", \"recipe\": \"libyuv/libyuv\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
|
| "--step-name=libyuv_unittest",
|
| - "--builder-name=Mac64 Release",
|
| + "--builder-name=Mac64 Release (GN)",
|
| "--slave-name=slavename",
|
| "libyuv_unittest"
|
| ],
|
|
|