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

Unified Diff: scripts/slave/recipes/ios/try.expected/gn.json

Issue 2133483002: Fix configuration of goma in iOS recipes. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: improve wording in comment Created 4 years, 5 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
« no previous file with comments | « scripts/slave/recipes/ios/try.py ('k') | scripts/slave/recipes/ios/try.expected/gyp_goma.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/ios/try.expected/gn.json
diff --git a/scripts/slave/recipes/ios/try.expected/gn.json b/scripts/slave/recipes/ios/try.expected/gn.json
index f385238ee47a851ff09c13248fcac04b67459d47..f77b26c3fbe6b5063c33c0cd93c414e2052fe651 100644
--- a/scripts/slave/recipes/ios/try.expected/gn.json
+++ b/scripts/slave/recipes/ios/try.expected/gn.json
@@ -187,27 +187,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "runhooks"
- ],
- "cwd": "[SLAVE_BUILD]/src",
- "env": {
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "",
- "GYP_GENERATORS": "ninja",
- "LANDMINES_VERBOSE": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient runhooks (with patch)",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br />GYP_DEFINES:<br /><br />GYP_CHROMIUM_NO_ACTION=1@@@"
- ]
- },
- {
"cmd": [],
"name": "ensure_goma"
},
@@ -265,6 +244,27 @@
"cmd": [
"python",
"-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+ "runhooks"
+ ],
+ "cwd": "[SLAVE_BUILD]/src",
+ "env": {
+ "GYP_CHROMIUM_NO_ACTION": "1",
+ "GYP_CROSSCOMPILE": "1",
+ "GYP_DEFINES": "",
+ "GYP_GENERATORS": "ninja",
+ "LANDMINES_VERBOSE": "1",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ },
+ "name": "gclient runhooks (with patch)",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@<br />GYP_DEFINES:<br /><br />GYP_CHROMIUM_NO_ACTION=1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[SLAVE_BUILD]/src/tools/mb/mb.py",
"gen",
"-m",
@@ -333,7 +333,7 @@
"-b",
"ios-simulator-gn",
"-v",
- "//out/None",
+ "//out/Release",
"{\"additional_compile_targets\": [\"All\", \"fake tests\"], \"files\": [\"foo.cc\"], \"test_targets\": [\"fake tests\"]}",
"/path/to/tmp/json"
],
« no previous file with comments | « scripts/slave/recipes/ios/try.py ('k') | scripts/slave/recipes/ios/try.expected/gyp_goma.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698