commit 568ec138fbbc3d967f8bf934b13007ad728bd1dd
author Michael Mortensen <mmortensen@google.com> Thu Jun 27 16:56:21 2019 +0000
committer Michael Mortensen <mmortensen@google.com> Thu Jun 27 21:40:26 2019 +0000
tree 5cd53780eb19beeabed2d5f65ed6bca5b2912de8
parent 62ba518265e5552471ee226d2cf99a12e8a38058

Revert "Build API: Refactor service/lib and commands.py to use artifacts.BundleFirmware"

BUG=b:136134313
TEST=manual, run_tests

This reverts commit 3df9c76a49990d758076452ea8aef60da7916085.

Reason for revert: Causing failures for atlas (b/136134313)

Original change's description:
> Build API: Refactor service/lib and commands.py to use artifacts.BundleFirmware
>
> BUG=chromium:954300
> TEST=manual, run_tests
>
> Change-Id: I50d45449ed775cd8a1fc563f678a4f773a7cbd98
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1667502
> Tested-by: Michael Mortensen <mmortensen@google.com>
> Reviewed-by: Andrew Lamb <andrewlamb@chromium.org>
> Reviewed-by: Alex Klein <saklein@chromium.org>
> Commit-Queue: Michael Mortensen <mmortensen@google.com>

Bug: chromium:954300
Change-Id: I8fde3807bf6fff767d90d11739cf01db47d5503b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1680449
Reviewed-by: Alex Klein <saklein@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
Commit-Queue: Michael Mortensen <mmortensen@google.com>
Tested-by: Michael Mortensen <mmortensen@google.com>

api/controller/artifacts.py

diff --git a/api/controller/artifacts.py b/api/controller/artifacts.py
index ddee4f6..68a9aa8 100644
--- a/api/controller/artifacts.py
+++ b/api/controller/artifacts.py
@@ -227,20 +227,16 @@
     input_proto (BundleRequest): The input proto.
     output_proto (BundleResponse): The output proto.
   """
+  target = input_proto.build_target.name
   output_dir = input_proto.output_dir
-  if not output_dir:
-    cros_build_lib.Die('output_dir is required.')
-  chroot = controller_util.ParseChroot(input_proto.chroot)
-  sysroot_path = input_proto.sysroot.path
-  if not sysroot_path:
-    cros_build_lib.Die('sysroot.path is required.')
-  sysroot = sysroot_lib.Sysroot(sysroot_path)
-  archive = artifacts.BuildFirmwareArchive(chroot, sysroot, output_dir)
+  build_root = constants.SOURCE_ROOT
+
+  # TODO(crbug.com/954300): Replace with a chromite/service implementation.
+  archive = commands.BuildFirmwareArchive(build_root, target, output_dir)
 
   if archive is None:
     cros_build_lib.Die(
-        'Could not create firmware archive. No firmware found for %s.',
-        sysroot_path)
+        'Could not create firmware archive. No firmware found for %s.', target)
 
   output_proto.artifacts.add().path = os.path.join(output_dir, archive)