diff options
| author | dpranke <dpranke@chromium.org> | 2015-12-14 14:17:52 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-14 22:18:38 +0000 |
| commit | f75a3de5c437eb21216fe04e10b7bdbb486c96c8 (patch) | |
| tree | 13bfb4c76b2ebd009056266cdeba5fa983920899 /ios/build | |
| parent | efbc4da08ec32dbde81a8b86e7c1399dcf530c9a (diff) | |
| download | chromium_src-f75a3de5c437eb21216fe04e10b7bdbb486c96c8.zip chromium_src-f75a3de5c437eb21216fe04e10b7bdbb486c96c8.tar.gz chromium_src-f75a3de5c437eb21216fe04e10b7bdbb486c96c8.tar.bz2 | |
Reland of Enable goma on iOS CQ bots and matching waterfall bots. (patchset #1 id:1 of https://codereview.chromium.org/1518393002/ )
Reason for revert:
Re-landing the original change since the build-side issue has been fixed.
Original issue's description:
> Revert of Enable goma on iOS CQ bots and matching waterfall bots. (patchset #7 id:180001 of https://codereview.chromium.org/1515933003/ )
>
> Reason for revert:
> Uncaught exception on iOS_Device ninja builder.
>
> https://build.chromium.org/p/chromium.mac/builders/iOS_Device_%28ninja%29/builds/32818
>
> Original issue's description:
> > Enable goma on iOS CQ bots and matching waterfall bots.
> >
> > By flipping the existing bots to use MB to invoke GYP instead
> > of invoking GYP via `gclient runhooks`, we can enable goma
> > solely by src-side changes.
> >
> > R=smut@google.com, phajdan.jr@chromium.org
> > BUG=564374
> >
> > Committed: https://crrev.com/63ca22d6bb7feb029a766f49fa8ee9bcbcfc7d76
> > Cr-Commit-Position: refs/heads/master@{#364866}
>
> TBR=phajdan.jr@chromium.org,smut@google.com,dpranke@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=564374
>
> Committed: https://crrev.com/8fb34db92b286b24e39fba2943fe2679a1b5cdce
> Cr-Commit-Position: refs/heads/master@{#364974}
TBR=phajdan.jr@chromium.org,smut@google.com,perkj@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=564374
Review URL: https://codereview.chromium.org/1520253004
Cr-Commit-Position: refs/heads/master@{#365109}
Diffstat (limited to 'ios/build')
3 files changed, 15 insertions, 3 deletions
diff --git a/ios/build/bots/chromium.mac/iOS_Device_(ninja).json b/ios/build/bots/chromium.mac/iOS_Device_(ninja).json index 5440881..0b4031a 100644 --- a/ios/build/bots/chromium.mac/iOS_Device_(ninja).json +++ b/ios/build/bots/chromium.mac/iOS_Device_(ninja).json @@ -7,9 +7,13 @@ ], "xcode version": "7.0", "GYP_DEFINES": { + "OS": "ios", "chromium_ios_signing": "0", - "target_subarch": "both" + "gomadir": "$(goma_dir)", + "target_subarch": "both", + "use_goma": "1" }, + "mb_type": "gyp", "compiler": "ninja", "configuration": "Release", "sdk": "iphoneos9.0", diff --git a/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_ninja.json b/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_ninja.json index 8f3e195..7cb285e 100644 --- a/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_ninja.json +++ b/ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_ninja.json @@ -7,9 +7,13 @@ ], "xcode version": "7.0", "GYP_DEFINES": { + "OS": "ios", "chromium_ios_signing": "0", - "target_subarch": "both" + "gomadir": "$(goma_dir)", + "target_subarch": "both", + "use_goma": "1" }, + "mb_type": "gyp", "compiler": "ninja", "configuration": "Debug", "sdk": "iphonesimulator9.0", diff --git a/ios/build/bots/tryserver.chromium.mac/ios_rel_device_ninja.json b/ios/build/bots/tryserver.chromium.mac/ios_rel_device_ninja.json index 5440881..0b4031a 100644 --- a/ios/build/bots/tryserver.chromium.mac/ios_rel_device_ninja.json +++ b/ios/build/bots/tryserver.chromium.mac/ios_rel_device_ninja.json @@ -7,9 +7,13 @@ ], "xcode version": "7.0", "GYP_DEFINES": { + "OS": "ios", "chromium_ios_signing": "0", - "target_subarch": "both" + "gomadir": "$(goma_dir)", + "target_subarch": "both", + "use_goma": "1" }, + "mb_type": "gyp", "compiler": "ninja", "configuration": "Release", "sdk": "iphoneos9.0", |