diff options
| -rwxr-xr-x | firmware_builder.py | 4 | ||||
| -rwxr-xr-x | zephyr/firmware_builder.py | 8 |
2 files changed, 5 insertions, 7 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' diff --git a/zephyr/firmware_builder.py b/zephyr/firmware_builder.py index fe71fb1ddc..f95e3e2b50 100755 --- a/zephyr/firmware_builder.py +++ b/zephyr/firmware_builder.py @@ -13,12 +13,12 @@ import multiprocessing import pathlib import subprocess import sys -import zmake.project -# 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 google.protobuf import json_format +import zmake.project + +from chromite.api.gen_sdk.chromite.api import firmware_pb2 + DEFAULT_BUNDLE_DIRECTORY = '/tmp/artifact_bundles' DEFAULT_BUNDLE_METADATA_FILE = '/tmp/artifact_bundle_metadata' |