Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_gyp.json

Issue 2412033002: libyuv: Switch bots over to GN by default. (Closed)
Patch Set: Reverted is_component_build changes in chromium recipe module. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_gyp.json
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_gn.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_gyp.json
similarity index 94%
rename from scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_gn.json
rename to scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_gyp.json
index fad64b4ea22cd389e54309f14b80cd7d93ae508e..f281151ffa793789c7f4d3c60d96a8d3c1615390 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_gn.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_linux_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_DEFINES": "component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -144,19 +143,6 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gn.py",
- "--root=[SLAVE_BUILD]/src",
- "gen",
- "//out/Debug",
- "--args=is_debug=true target_cpu=\"x64\" 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",
@@ -172,13 +158,13 @@
"--goma-cache-dir",
"[GOMA_CACHE]",
"--buildbot-buildername",
- "linux_gn",
+ "linux_gyp",
"--buildbot-mastername",
"tryserver.libyuv",
"--buildbot-slavename",
"slavename",
"--goma-deps-cache-file",
- "linux_gn.gomadeps",
+ "linux_gyp.gomadeps",
"--compiler",
"goma",
"--goma-jsonstatus",
@@ -189,8 +175,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"

Powered by Google App Engine
This is Rietveld 408576698