| Index: scripts/slave/recipe_modules/blimp/example.py
|
| diff --git a/scripts/slave/recipes/blimp/integration.py b/scripts/slave/recipe_modules/blimp/example.py
|
| similarity index 81%
|
| copy from scripts/slave/recipes/blimp/integration.py
|
| copy to scripts/slave/recipe_modules/blimp/example.py
|
| index 7eff661a3ad9c2484c21065b8b4e63ba54b24724..a166db51cce9af18d9e3622a8366041530364352 100644
|
| --- a/scripts/slave/recipes/blimp/integration.py
|
| +++ b/scripts/slave/recipe_modules/blimp/example.py
|
| @@ -7,21 +7,13 @@ from recipe_engine.recipe_api import Property
|
| from recipe_engine.types import freeze
|
|
|
| DEPS = [
|
| + 'blimp',
|
| 'chromium',
|
| 'chromium_android',
|
| - 'chromium_swarming',
|
| - 'chromium_tests',
|
| 'depot_tools/bot_update',
|
| 'depot_tools/gclient',
|
| - 'recipe_engine/json',
|
| 'recipe_engine/path',
|
| - 'recipe_engine/platform',
|
| 'recipe_engine/properties',
|
| - 'recipe_engine/python',
|
| - 'recipe_engine/step',
|
| - 'swarming',
|
| - 'test_results',
|
| - 'test_utils',
|
| ]
|
|
|
| BUILDERS = freeze({
|
| @@ -52,6 +44,7 @@ def RunSteps(api):
|
|
|
| api.gclient.set_config(builder['gclient_config'])
|
| api.gclient.apply_config(builder['gclient_apply_config'])
|
| + api.blimp.set_config('base_config')
|
| api.bot_update.ensure_checkout()
|
| api.chromium.ensure_goma()
|
| api.chromium_android.clean_local_files()
|
| @@ -59,22 +52,27 @@ def RunSteps(api):
|
|
|
| android_build = api.path['checkout'].join('out-android')
|
| linux_build = api.path['checkout'].join('out-linux')
|
| + android_debug_dir = android_build.join(api.chromium.c.build_config_fs)
|
| + linux_debug_dir = linux_build.join(api.chromium.c.build_config_fs)
|
|
|
| api.chromium.run_mb(mastername=mastername,
|
| buildername=buildername,
|
| - build_dir=linux_build.join(
|
| - api.chromium.c.build_config_fs),
|
| + build_dir=linux_debug_dir,
|
| phase='engine')
|
| api.chromium.compile(targets=['blimp'],
|
| out_dir=linux_build)
|
| api.chromium.run_mb(mastername=mastername,
|
| buildername=buildername,
|
| - build_dir=android_build.join(
|
| - api.chromium.c.build_config_fs),
|
| + build_dir=android_debug_dir,
|
| phase='client')
|
| api.chromium.compile(targets=['blimp', 'chrome_public_apk'],
|
| out_dir=android_build)
|
|
|
| + apk_path = android_debug_dir.join('apks', 'ChromePublic.apk')
|
| +
|
| + with api.blimp.engine_forwarder(output_linux_dir=linux_debug_dir):
|
| + api.blimp.load_client(output_linux_dir=linux_debug_dir,
|
| + apk_path=apk_path)
|
|
|
| def GenTests(api):
|
| sanitize = lambda s: ''.join(c if c.isalnum() else '_' for c in s)
|
|
|