| Index: tools/mb/mb_config.pyl
|
| diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
|
| index e7428796bef6e1efb571d86172e4feb50baf03e4..1031e9cc8f187f4532b960debcc5bf8a4d8d9dd1 100644
|
| --- a/tools/mb/mb_config.pyl
|
| +++ b/tools/mb/mb_config.pyl
|
| @@ -1048,7 +1048,7 @@
|
| # that the GYP_DEFINES (or GN args) are set by the `cros chrome-sdk`
|
| # wrapper and need to be looked at specially.
|
| 'cros_chrome_sdk_gyp': [
|
| - 'gyp', 'error',
|
| + 'gyp', 'cros_chrome_sdk',
|
| ],
|
|
|
| # The 'findit' config is used by the *_variable_* bots, which run
|
| @@ -1911,6 +1911,17 @@
|
| 'disable_brotli_filter=1'),
|
| },
|
|
|
| + 'cros_chrome_sdk': {
|
| + # This is used so that the cros chrome_sdk (simplechrome) builders
|
| + # can manage the list of GYP_DEFINES and gn args in their .ebuild
|
| + # files and just pass through the desired arguments, hence not
|
| + # really using MB. If a bot uses this mixin, we expect that
|
| + # both GYP_DEFINES and GN_ARGS are set in the environment,
|
| + # and that GYP_DEFINES has chromeos=1 and GN_ARGS has
|
| + # target_os="chromeos" in it.
|
| + 'cros_passthrough': True,
|
| + },
|
| +
|
| 'crosscompile': {
|
| # This mixin is only needed on GYP bots that are doing cross-compiles
|
| # but are *not* targetting Android or iOS (where build/gyp_chromium
|
|
|