diff options
| author | Dirk Pranke <dpranke@chromium.org> | 2016-02-19 19:45:42 -0800 |
|---|---|---|
| committer | Dirk Pranke <dpranke@chromium.org> | 2016-02-20 03:48:49 +0000 |
| commit | 6faf6cb0ceeb36b269e4b91a22bf2051c8f69275 (patch) | |
| tree | 959385386d94a9c32c7ce5674c92a29fa1b8c5b0 /ios/build | |
| parent | 790992b74add808ad602fc366185bb126fe16474 (diff) | |
| download | chromium_src-6faf6cb0ceeb36b269e4b91a22bf2051c8f69275.zip chromium_src-6faf6cb0ceeb36b269e4b91a22bf2051c8f69275.tar.gz chromium_src-6faf6cb0ceeb36b269e4b91a22bf2051c8f69275.tar.bz2 | |
Fix iOS GN waterfall bots, take 3
I forgot that the GN arg is goma_dir, not gomadir, and
needed to be quoted as a string. Also, this CL enables
goma for the ios_rel_device_gn bot as well.
TBR=smut@chromium.org
BUG=517217
Review URL: https://codereview.chromium.org/1717873003 .
Cr-Commit-Position: refs/heads/master@{#376620}
Diffstat (limited to 'ios/build')
4 files changed, 9 insertions, 5 deletions
diff --git a/ios/build/bots/chromium.mac/iOS_Device_GN.json b/ios/build/bots/chromium.mac/iOS_Device_GN.json index 2845a90..1325aa5 100644 --- a/ios/build/bots/chromium.mac/iOS_Device_GN.json +++ b/ios/build/bots/chromium.mac/iOS_Device_GN.json @@ -14,7 +14,7 @@ "use_goma": "1" }, "gn_args": [ - "gomadir=$(goma_dir)", + "goma_dir=\"$(goma_dir)\"", "ios_enable_code_signing=false", "target_cpu=\"arm\"", "target_os=\"ios\"", diff --git a/ios/build/bots/chromium.mac/iOS_Simulator_GN_(dbg).json b/ios/build/bots/chromium.mac/iOS_Simulator_GN_(dbg).json index 24e0f7e2..c6a9dfbe 100644 --- a/ios/build/bots/chromium.mac/iOS_Simulator_GN_(dbg).json +++ b/ios/build/bots/chromium.mac/iOS_Simulator_GN_(dbg).json @@ -14,7 +14,7 @@ "use_goma": "1" }, "gn_args": [ - "gomadir=$(goma_dir)", + "goma_dir=\"$(goma_dir)\"", "target_os=\"ios\"", "use_goma=true" ], diff --git a/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_gn.json b/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_gn.json index 9570a00..5c90caa 100644 --- a/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_gn.json +++ b/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_gn.json @@ -14,7 +14,7 @@ "use_goma": "1" }, "gn_args": [ - "gomadir=$(goma_dir)", + "goma_dir=\"$(goma_dir)\"", "target_os=\"ios\"", "use_goma=true" ], diff --git a/ios/build/bots/tryserver.chromium.mac/ios_rel_device_gn.json b/ios/build/bots/tryserver.chromium.mac/ios_rel_device_gn.json index 776160f..e87edf8 100644 --- a/ios/build/bots/tryserver.chromium.mac/ios_rel_device_gn.json +++ b/ios/build/bots/tryserver.chromium.mac/ios_rel_device_gn.json @@ -9,12 +9,16 @@ "xcode version": "7.0", "GYP_DEFINES": { "chromium_ios_signing": "0", - "target_subarch": "both" + "gomadir": "$(gomadir)", + "target_subarch": "both", + "use_goma": "1" }, "gn_args": [ + "goma_dir=\"$(goma_dir)\"", "ios_enable_code_signing=false", "target_cpu=\"arm\"", - "target_os=\"ios\"" + "target_os=\"ios\"", + "use_goma=true" ], "mb_type": "gn", "compiler": "ninja", |