summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Bettis <jbettis@google.com>2021-04-14 16:07:26 -0600
committerCommit Bot <commit-bot@chromium.org>2021-04-29 17:45:37 +0000
commitdaf1423b9c4949773d198ad50f82d9283c70c670 (patch)
treeea2fed70b92ec39d7700b966def810ae61047d40
parentb0cf18ad002e0610326170fee4e522fcf90fe2ab (diff)
downloadchrome-ec-daf1423b9c4949773d198ad50f82d9283c70c670.tar.gz
servo: Remove define PROTOBUF_MIN_PROTOC_VERSION
Something changed in the chroot, and this is causing problems now. BRANCH=servo BUG=b:178484932 TEST=make -j buildall runhosttests Signed-off-by: Jeremy Bettis <jbettis@google.com> Change-Id: Ie00e5120bc8dbe411b447a0b68d76a8f7151f815 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2827327 Tested-by: Jeremy Bettis <jbettis@chromium.org> Commit-Queue: Jeremy Bettis <jbettis@chromium.org> Reviewed-by: Brian Nemec <bnemec@chromium.org>
-rw-r--r--Makefile.toolchain1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.toolchain b/Makefile.toolchain
index f7ae354b10..9f16a3fcaf 100644
--- a/Makefile.toolchain
+++ b/Makefile.toolchain
@@ -79,7 +79,6 @@ CFLAGS_DEFINE=-DOUTDIR=$(out)/$(BLD) -DCHIP=$(CHIP) -DBOARD_TASKFILE=$(_tsk_lst_
-DCHIP_VARIANT_$(UC_CHIP_VARIANT)=$(EMPTY) \
-DCHIP_FAMILY_$(UC_CHIP_FAMILY)=$(EMPTY) \
-DFINAL_OUTDIR=$(out) \
- -DPROTOBUF_MIN_PROTOC_VERSION=0 \
$(CFLAGS_BASEBOARD)
CPPFLAGS=$(CFLAGS_DEFINE) $(CFLAGS_INCLUDE) $(CFLAGS_TEST) \
$(EXTRA_CFLAGS) $(CFLAGS_COVERAGE) $(LATE_CFLAGS_DEFINE) \