From 589ee5ae6253aa88172e087b980817ec1c4dfb91 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 26 Jun 2023 07:26:39 +0000 Subject: [PATCH] Add nogncheck to protobuf_utils.h #include. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GN dependency checker doesn't run the preprocessor, so when the build is configured with `rtc_enable_protobuf = false` it complains that protobuf headers don't have a dependency (since the dependency is not added here [1]). It is unclear why this problem didn't show up before [2]. [1] - https://source.chromium.org/chromium/chromium/src/+/main:third_party/webrtc/rtc_base/BUILD.gn;l=26-29;drc=45afbc1e81449609cea181e410fa6875b00ec151 [2] - https://webrtc-review.googlesource.com/c/src/+/309262 Bug: None Change-Id: I139fe3a9804209f0ca39a5cccce8fd4f3ae062c5 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/310320 Commit-Queue: Björn Terelius Commit-Queue: Mirko Bonadei Reviewed-by: Björn Terelius Auto-Submit: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#40343} --- rtc_base/protobuf_utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtc_base/protobuf_utils.h b/rtc_base/protobuf_utils.h index 786365db1a..497b7f488f 100644 --- a/rtc_base/protobuf_utils.h +++ b/rtc_base/protobuf_utils.h @@ -15,8 +15,8 @@ #if WEBRTC_ENABLE_PROTOBUF -#include "third_party/protobuf/src/google/protobuf/message_lite.h" -#include "third_party/protobuf/src/google/protobuf/repeated_field.h" +#include "third_party/protobuf/src/google/protobuf/message_lite.h" // nogncheck +#include "third_party/protobuf/src/google/protobuf/repeated_field.h" // nogncheck namespace webrtc {