diff options
| author | LaMont Jones <lamontjones@chromium.org> | 2021-02-25 07:04:13 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-02-26 09:20:50 +0000 |
| commit | 623ce288f41ba027daa501877d1e39a91384c1ca (patch) | |
| tree | 4aba96b50642bdf20eb4b1378e7c17451b4244af | |
| parent | ec06848a3a10cd3eaa29db26781d7fa356e8ee24 (diff) | |
| download | chrome-ec-623ce288f41ba027daa501877d1e39a91384c1ca.tar.gz | |
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.
BRANCH=none
BUG=chromium:1181505
TEST=train
Signed-off-by: LaMont Jones <lamontjones@chromium.org>
Change-Id: Id49847bcd347f26e05eb494f8a6f6362009189ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2719650
Reviewed-by: Mike Nichols <mikenichols@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
| -rwxr-xr-x | firmware_builder.py | 4 |
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' |