diff options
| author | Jeremy Bettis <jbettis@google.com> | 2022-05-09 11:33:34 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-05-10 00:36:37 +0000 |
| commit | aea164530e64c56822ceb309bf38a4cf99d3a3ea (patch) | |
| tree | 471dc003182f61e54feac30e8736dd68bb2690f5 /firmware_builder.py | |
| parent | 7b149f78accdb0c287753d305f2f5b56128fbd39 (diff) | |
| download | chrome-ec-aea164530e64c56822ceb309bf38a4cf99d3a3ea.tar.gz | |
ec: Switch to gen_sdk import
Switch from importing chromite.api.gen.chromite.api to
chromite.api.gen_sdk.chromite.api, to avoid the odd import order.
BRANCH=None
BUG=b:187795298
TEST=Ran firmware builders
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I21ba7856679d67bd889a2585b28cdb74ef5493d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3635075
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'firmware_builder.py')
| -rwxr-xr-x | firmware_builder.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/firmware_builder.py b/firmware_builder.py index 625cb5166a..1a7b6c8749 100755 --- a/firmware_builder.py +++ b/firmware_builder.py @@ -19,9 +19,7 @@ import sys # pylint: disable=import-error from google.protobuf import json_format -# TODO(crbug/1181505): Code outside of chromite should not be importing from -# chromite.api.gen. Import json_format after that so we get the matching one. -from chromite.api.gen.chromite.api import firmware_pb2 +from chromite.api.gen_sdk.chromite.api import firmware_pb2 DEFAULT_BUNDLE_DIRECTORY = '/tmp/artifact_bundles' |