Revert of Cross-repo recipe package system.

scripts/slave/annotated_run.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import contextlib
 import json
 import optparse
 import os
 import subprocess
 import sys
 import tempfile
 
 BUILD_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(
     os.path.abspath(__file__))))
 sys.path.append(os.path.join(BUILD_ROOT, 'scripts'))
 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
 
-SCRIPT_PATH = os.path.dirname(os.path.abspath(__file__))
-BUILD_LIMITED_ROOT = os.path.join(
-    os.path.dirname(BUILD_ROOT), 'build_internal', 'scripts', 'slave')
-
-PACKAGE_CFG = os.path.join(
-    os.path.dirname(os.path.dirname(SCRIPT_PATH)),
-    'infra', 'config', 'recipes.cfg')
+from recipe_engine import main as recipe_main
 
 @contextlib.contextmanager
 def namedTempFile():
   fd, name = tempfile.mkstemp()
   os.close(fd)  # let the exceptions fly
   try:
     yield name
   finally:
     try:
       os.remove(name)
@@ skipping 157 matching lines @@
       s.step_warnings()
     os.environ['RUN_SLAVE_UPDATED_SCRIPTS'] = '1'
 
     # After running update scripts, set PYTHONIOENCODING=UTF-8 for the real
     # annotated_run.
     os.environ['PYTHONIOENCODING'] = 'UTF-8'
 
     return True
 
 
-def clean_old_recipe_engine():
-  """Clean stale pycs from the old location of recipe_engine.
-
-  This function should only be needed for a little while after the recipe
-  packages rollout (2015-09-16).
-  """
-  for (dirpath, _, filenames) in os.walk(
-      os.path.join(BUILD_ROOT, 'third_party', 'recipe_engine')):
-    for filename in filenames:
-      if filename.endswith('.pyc'):
-        path = os.path.join(dirpath, filename)
-        os.remove(path)
-
-
 def main(argv):
   opts, _ = get_args(argv)
   properties = get_recipe_properties(
       opts.factory_properties, opts.build_properties,
       opts.master_overrides_slave)
-
-  clean_old_recipe_engine()
-
-  # Find out if the recipe we intend to run is in build_internal's recipes. If
-  # so, use recipes.py from there, otherwise use the one from build.
-  recipe_file = properties['recipe'].replace('/', os.path.sep) + '.py'
-  if os.path.exists(os.path.join(BUILD_LIMITED_ROOT, 'recipes', recipe_file)):
-    recipe_runner = os.path.join(BUILD_LIMITED_ROOT, 'recipes.py')
-  else:
-    recipe_runner = os.path.join(SCRIPT_PATH, 'recipes.py')
-
-  with namedTempFile() as props_file:
-    with open(props_file, 'w') as fh:
-      fh.write(json.dumps(properties))
-    cmd = [
-        sys.executable, '-u', recipe_runner,
-        'run',
-        '--workdir=%s' % os.getcwd(),
-        '--properties-file=%s' % props_file,
-        properties['recipe'] ]
-    return subprocess.call(cmd)
+  stream = annotator.StructuredAnnotationStream()
+  ret = recipe_main.run_steps(properties, stream,
+                              universe=recipe_universe.get_universe())
+  return ret.status_code
 
 
 def shell_main(argv):
   if update_scripts():
     return subprocess.call([sys.executable] + argv)
   else:
     return main(argv)
 
-
 if __name__ == '__main__':
   sys.exit(shell_main(sys.argv))