cq: Build usb_updater2 in cq

Add an explicit build of extra/usb_updater usb_updater2 to the EC cq.

This should catch x86_64 problems in usb_updater2 faster, but won't
catch other arch problems (those will be caught by pupr instead).

BUG=None
BRANCH=None
TEST=Checked out snapshot 3585ff4421b2256294b1d3a6568adc5b936ff91c
verified failure. Cherrypicked crrev/c/4311236, verified success.

Cq-Depend: chromium:4311236
Change-Id: Ie65cb512723cbd189b8d8675b691e511b30da094
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4312241
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: caveh jalali <caveh@chromium.org>
Commit-Queue: caveh jalali <caveh@chromium.org>
Reviewed-by: Rob Barnes <robbarnes@google.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/firmware_builder.py b/firmware_builder.py
index d633f56388..a25adad799 100755
--- a/firmware_builder.py
+++ b/firmware_builder.py
@@ -3,6 +3,7 @@
 # Copyright 2020 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+
 """Build, bundle, or test all of the EC boards.
 
 This is the entry point for the custom firmware builder workflow recipe.  It
@@ -112,6 +113,15 @@ def build(opts):
     print(f"# Running {' '.join(cmd)}.")
     subprocess.run(cmd, cwd=os.path.dirname(__file__), check=True)
 
+    # extra/usb_updater is used in chromeos-base/ec-devutils
+    cmd = ["make", "-C", "extra/usb_updater", "clean"]
+    print(f"# Running {' '.join(cmd)}.")
+    subprocess.run(cmd, cwd=os.path.dirname(__file__), check=True)
+
+    cmd = ["make", "-C", "extra/usb_updater", "usb_updater2", f"-j{opts.cpus}"]
+    print(f"# Running {' '.join(cmd)}.")
+    subprocess.run(cmd, cwd=os.path.dirname(__file__), check=True)
+
     cmd = ["make", "print-all-baseboards", f"-j{opts.cpus}"]
     print(f"# Running {' '.join(cmd)}.")
     baseboards = {}