firmware_builder: temporary protobuf fix
firmware_builder should not be importing from chromite.api.gen. This
works around the issue while we implement the fix.
BUG=chromium:1181505
TEST=train
Change-Id: I1c497761b091fd10d1340e4f8c5219992480a777
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/zephyr-chrome/+/2719651
Tested-by: LaMont Jones <lamontjones@chromium.org>
Auto-Submit: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: Mike Nichols <mikenichols@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
diff --git a/firmware_builder.py b/firmware_builder.py
index 9422347..277d1cf 100755
--- a/firmware_builder.py
+++ b/firmware_builder.py
@@ -15,9 +15,11 @@
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
def build(opts):
"""Builds all Zephyr firmware targets"""
