| Index: scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gyp.json
|
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gn.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gyp.json
|
| similarity index 93%
|
| rename from scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gn.json
|
| rename to scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gyp.json
|
| index f93281d5e93fd2d044d3f8ef85efc4e4bd3f3b2e..7169fd004df2935ff035df418d0792880437b5d5 100644
|
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gn.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gyp.json
|
| @@ -134,7 +134,6 @@
|
| "cwd": "[SLAVE_BUILD]/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",
|
| "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| @@ -145,19 +144,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gn.py",
|
| - "--root=[SLAVE_BUILD]/src",
|
| - "gen",
|
| - "//out/Debug",
|
| - "--args=is_debug=true target_os=\"android\" target_cpu=\"arm\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| - "name": "gn"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| "--show-path",
|
| "python",
|
| @@ -173,13 +159,13 @@
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "android_gn",
|
| + "android_gyp",
|
| "--buildbot-mastername",
|
| "tryserver.libyuv",
|
| "--buildbot-slavename",
|
| "slavename",
|
| "--goma-deps-cache-file",
|
| - "android_gn.gomadeps",
|
| + "android_gyp.gomadeps",
|
| "--compiler",
|
| "goma",
|
| "--goma-jsonstatus",
|
| @@ -190,8 +176,7 @@
|
| "[CACHE]/cipd/goma",
|
| "--goma-fail-fast",
|
| "--goma-disable-local-fallback",
|
| - "--",
|
| - "all"
|
| + "--"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
|
|