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

Unified Diff: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_gyp_rel.json

Issue 2288063002: WebRTC: Repurpose GN bots to GYP for all but iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Fix typo Created 4 years, 4 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/webrtc/standalone.expected/tryserver_webrtc_android_gyp_rel.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_gn_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_gyp_rel.json
similarity index 89%
rename from scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_gn_rel.json
rename to scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_gyp_rel.json
index d54fb947297f1f6807bfcbc8d72a740bc29dd977..de74840ba59bfedeab179baecea6e5b2dadbe861 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_gn_rel.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_gyp_rel.json
@@ -4,7 +4,7 @@
"python",
"-u",
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
- "[BUILDER_CACHE]/android_gn_rel",
+ "[BUILDER_CACHE]/android_gyp_rel",
"511"
],
"name": "makedirs checkout path",
@@ -29,7 +29,7 @@
"--master",
"tryserver.webrtc",
"--builder",
- "android_gn_rel",
+ "android_gyp_rel",
"--slave",
"slavename",
"--spec",
@@ -52,7 +52,7 @@
"src@12345",
"--output_manifest"
],
- "cwd": "[BUILDER_CACHE]/android_gn_rel",
+ "cwd": "[BUILDER_CACHE]/android_gyp_rel",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -89,7 +89,7 @@
"python",
"-u",
"RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
- "[BUILDER_CACHE]/android_gn_rel/src/out"
+ "[BUILDER_CACHE]/android_gyp_rel/src/out"
],
"name": "clean test output files"
},
@@ -98,10 +98,10 @@
"python",
"-u",
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
- "[BUILDER_CACHE]/android_gn_rel/src/out/Release/debug_info_dumps",
- "[BUILDER_CACHE]/android_gn_rel/src/out/Release/test_logs",
- "[BUILDER_CACHE]/android_gn_rel/src/out/build_product.zip",
- "[BUILDER_CACHE]/android_gn_rel/src"
+ "[BUILDER_CACHE]/android_gyp_rel/src/out/Release/debug_info_dumps",
+ "[BUILDER_CACHE]/android_gyp_rel/src/out/Release/test_logs",
+ "[BUILDER_CACHE]/android_gyp_rel/src/out/build_product.zip",
+ "[BUILDER_CACHE]/android_gyp_rel/src"
],
"name": "clean local files",
"~followup_annotations": [
@@ -185,13 +185,13 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[BUILDER_CACHE]/android_gn_rel/src",
+ "cwd": "[BUILDER_CACHE]/android_gyp_rel/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": "[BUILDER_CACHE]/android_gn_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_gn_rel/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ "PATH": "[BUILDER_CACHE]/android_gyp_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_gyp_rel/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
@@ -199,20 +199,20 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/android_gn_rel/src/tools/mb/mb.py",
+ "[BUILDER_CACHE]/android_gyp_rel/src/tools/mb/mb.py",
"gen",
"-m",
"tryserver.webrtc",
"-b",
- "android_gn_rel",
+ "android_gyp_rel",
"--config-file",
- "[BUILDER_CACHE]/android_gn_rel/src/webrtc/build/mb_config.pyl",
+ "[BUILDER_CACHE]/android_gyp_rel/src/webrtc/build/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
- "--gyp-script=[BUILDER_CACHE]/android_gn_rel/src/webrtc/build/gyp_webrtc.py",
+ "--gyp-script=[BUILDER_CACHE]/android_gyp_rel/src/webrtc/build/gyp_webrtc.py",
"//out/Release"
],
- "cwd": "[BUILDER_CACHE]/android_gn_rel/src",
+ "cwd": "[BUILDER_CACHE]/android_gyp_rel/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -233,7 +233,7 @@
"--target",
"Release",
"--src-dir",
- "[BUILDER_CACHE]/android_gn_rel/src",
+ "[BUILDER_CACHE]/android_gyp_rel/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
"--goma-deps-cache-dir",
@@ -248,12 +248,11 @@
"[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",
- "PATH": "[BUILDER_CACHE]/android_gn_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_gn_rel/src/build/android:%(PATH)s"
+ "PATH": "[BUILDER_CACHE]/android_gyp_rel/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_gyp_rel/src/build/android:%(PATH)s"
},
"name": "compile",
"~followup_annotations": [

Powered by Google App Engine
This is Rietveld 408576698