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

Unified Diff: scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gyp_rel.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_android_gyp_rel.json
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gn_rel.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gyp_rel.json
similarity index 93%
rename from scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gn_rel.json
rename to scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gyp_rel.json
index d052e374a411b4f1ca4c5215d25c09eaac303667..8cedb23d8c7b0f715c61b3dc6f3e9687f59bb483 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gn_rel.json
+++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_android_gyp_rel.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/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",
@@ -173,13 +159,13 @@
"--goma-cache-dir",
"[GOMA_CACHE]",
"--buildbot-buildername",
- "android_gn_rel",
+ "android_gyp_rel",
"--buildbot-mastername",
"tryserver.libyuv",
"--buildbot-slavename",
"slavename",
"--goma-deps-cache-file",
- "android_gn_rel.gomadeps",
+ "android_gyp_rel.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",

Powered by Google App Engine
This is Rietveld 408576698