| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gn.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gn.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gn.json
|
| index ef7c4678a9afb83621cd8614e33a9cca053aff21..2b79cbb6f35e8ffe14520561390d4f8338ed10ea 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gn.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_gn.json
|
| @@ -92,35 +92,6 @@
|
| ]
|
| },
|
| {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "runhooks"
|
| - ],
|
| - "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='[BUILD]/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]"
|
| - },
|
| - "name": "gclient runhooks"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[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=\"[BUILD]/goma\""
|
| - ],
|
| - "name": "gn"
|
| - },
|
| - {
|
| "cmd": [],
|
| "name": "ensure_goma"
|
| },
|
| @@ -178,6 +149,35 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| + "runhooks"
|
| + ],
|
| + "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]"
|
| + },
|
| + "name": "gclient runhooks"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[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\""
|
| + ],
|
| + "name": "gn"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| "--show-path",
|
| "python",
|
|
|