Chromium Code Reviews| Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_release__gn_.json |
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_release__clang_.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_release__gn_.json |
| similarity index 85% |
| copy from scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_release__clang_.json |
| copy to scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_release__gn_.json |
| index 090ce219278c69bcd49772af4d42d5efeb6602f9..b302d09b707489e8845a19df22db7b9209faa6e2 100644 |
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_release__clang_.json |
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_win64_release__gn_.json |
| @@ -7,7 +7,7 @@ |
| "--master", |
| "client.libyuv", |
| "--builder", |
| - "Win64 Release (Clang)", |
| + "Win64 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_x64", |
| + "--args=is_debug=false target_cpu=\"x64\" use_goma=true goma_dir=\"[BUILD]\\goma\"" |
|
Michael Achenbach
2016/04/06 19:17:21
Non-expert question: Guess component=static_librar
|
| + ], |
| + "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_x64", |
| "--factory-properties", |
| - "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Win64 Release (Clang)\", \"mastername\": \"client.libyuv\", \"recipe\": \"libyuv/libyuv\", \"revision\": \"12345\", \"slavename\": \"slavename\"}", |
| + "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Win64 Release (GN)\", \"mastername\": \"client.libyuv\", \"recipe\": \"libyuv/libyuv\", \"revision\": \"12345\", \"slavename\": \"slavename\"}", |
| "--build-properties", |
| - "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Win64 Release (Clang)\", \"mastername\": \"client.libyuv\", \"recipe\": \"libyuv/libyuv\", \"revision\": \"12345\", \"slavename\": \"slavename\"}", |
| + "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Win64 Release (GN)\", \"mastername\": \"client.libyuv\", \"recipe\": \"libyuv/libyuv\", \"revision\": \"12345\", \"slavename\": \"slavename\"}", |
| "--step-name=libyuv_unittest", |
| - "--builder-name=Win64 Release (Clang)", |
| + "--builder-name=Win64 Release (GN)", |
| "--slave-name=slavename", |
| "libyuv_unittest.exe" |
| ], |