| Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_release__gyp_.json
|
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_release__gn_.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_release__gyp_.json
|
| similarity index 93%
|
| rename from scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_release__gn_.json
|
| rename to scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_release__gyp_.json
|
| index fbdf2ef1fa4a54661077e15bf4718dccb6268508..c086757ccb21a08316fe1dd39a1ac5f621c287c6 100644
|
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_release__gn_.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_release__gyp_.json
|
| @@ -128,7 +128,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 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]"
|
| @@ -139,19 +138,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gn.py",
|
| - "--root=[SLAVE_BUILD]/src",
|
| - "gen",
|
| - "//out/Release",
|
| - "--args=is_debug=false 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",
|
| @@ -167,13 +153,13 @@
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "Android Release (GN)",
|
| + "Android Release (GYP)",
|
| "--buildbot-mastername",
|
| "client.libyuv",
|
| "--buildbot-slavename",
|
| "slavename",
|
| "--goma-deps-cache-file",
|
| - "Android_Release__GN_.gomadeps",
|
| + "Android_Release__GYP_.gomadeps",
|
| "--compiler",
|
| "goma",
|
| "--goma-jsonstatus",
|
| @@ -182,8 +168,7 @@
|
| "/creds/service_accounts/service-account-goma-client.json",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "--",
|
| - "all"
|
| + "--"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
|
|