| Index: scripts/slave/annotated_run.py
|
| diff --git a/scripts/slave/annotated_run.py b/scripts/slave/annotated_run.py
|
| index 31a6cf5599310e33dcc963db77d9dbcecf6668be..3f20ca9007376842c68e5adff9065a0634729b72 100755
|
| --- a/scripts/slave/annotated_run.py
|
| +++ b/scripts/slave/annotated_run.py
|
| @@ -19,9 +19,13 @@ sys.path.append(os.path.join(BUILD_ROOT, 'third_party'))
|
| from common import annotator
|
| from common import chromium_utils
|
| from common import master_cfg_utils
|
| -from slave import recipe_universe
|
|
|
| +from recipe_engine import loader
|
| from recipe_engine import main as recipe_main
|
| +from recipe_engine import package
|
| +
|
| +PACKAGE_PYL = os.path.join(
|
| + os.path.dirname(os.path.abspath(__file__)), 'recipe_package.pyl')
|
|
|
| @contextlib.contextmanager
|
| def namedTempFile():
|
| @@ -203,8 +207,8 @@ def main(argv):
|
| opts.factory_properties, opts.build_properties,
|
| opts.master_overrides_slave)
|
| stream = annotator.StructuredAnnotationStream()
|
| - ret = recipe_main.run_steps(properties, stream,
|
| - universe=recipe_universe.get_universe())
|
| + universe = loader.RecipeUniverse(package.PackageDeps.create(PACKAGE_PYL))
|
| + ret = recipe_main.run_steps(properties, stream, universe=universe)
|
| return ret.status_code
|
|
|
|
|
|
|