summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xfirmware_builder.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/firmware_builder.py b/firmware_builder.py
index 1a6940d8c9..b85e9f7be2 100755
--- a/firmware_builder.py
+++ b/firmware_builder.py
@@ -15,9 +15,11 @@ import os
import subprocess
import sys
+# 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
-from chromite.api.gen.chromite.api import firmware_pb2
DEFAULT_BUNDLE_DIRECTORY = '/tmp/artifact_bundles'
DEFAULT_BUNDLE_METADATA_FILE = '/tmp/artifact_bundle_metadata'