From aea164530e64c56822ceb309bf38a4cf99d3a3ea Mon Sep 17 00:00:00 2001 From: Jeremy Bettis Date: Mon, 9 May 2022 11:33:34 -0600 Subject: 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 Change-Id: I21ba7856679d67bd889a2585b28cdb74ef5493d7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3635075 Tested-by: Jeremy Bettis Auto-Submit: Jeremy Bettis Reviewed-by: Mike Frysinger Commit-Queue: Mike Frysinger --- firmware_builder.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'firmware_builder.py') 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' -- cgit v1.2.1