From 5d520cbcca77cacf034dba2f30042e419bc978f6 Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Wed, 8 May 2024 12:19:53 +0200
Subject: executor: use new flatbuffers location

---
 Makefile                 | 4 ++--
 sys/targets/targets.go   | 2 +-
 tools/check-copyright.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 459037457..f13d125f1 100644
--- a/Makefile
+++ b/Makefile
@@ -279,11 +279,11 @@ configs: kconf
 	bin/syz-kconf -config dashboard/config/linux/main.yml -sourcedir $(SOURCEDIR)
 
 tidy: descriptions
-	clang-tidy -quiet -header-filter=executor/.* -warnings-as-errors=* \
+	clang-tidy -quiet -header-filter=executor/[^_].* -warnings-as-errors=* \
 		-checks=-*,misc-definitions-in-headers,bugprone-macro-parentheses,clang-analyzer-*,-clang-analyzer-security.insecureAPI*,-clang-analyzer-optin.performance* \
 		-extra-arg=-DGOOS_$(TARGETOS)=1 -extra-arg=-DGOARCH_$(TARGETARCH)=1 \
 		-extra-arg=-DHOSTGOOS_$(HOSTOS)=1 -extra-arg=-DGIT_REVISION=\"$(REV)\" \
-		--extra-arg=-I. --extra-arg=-Ivendor \
+		--extra-arg=-I. --extra-arg=-Iexecutor/_include \
 		executor/*.cc
 
 ifdef CI
diff --git a/sys/targets/targets.go b/sys/targets/targets.go
index 3635eb023..8a1b80f27 100644
--- a/sys/targets/targets.go
+++ b/sys/targets/targets.go
@@ -586,7 +586,7 @@ var (
 	commonCFlags = []string{
 		"-std=c++11",
 		"-I.",
-		"-Ivendor",
+		"-Iexecutor/_include",
 		"-O2",
 		"-pthread",
 		"-Wall",
diff --git a/tools/check-copyright.sh b/tools/check-copyright.sh
index 6dd293398..6cab5890d 100755
--- a/tools/check-copyright.sh
+++ b/tools/check-copyright.sh
@@ -6,7 +6,7 @@ FILES=0
 FAILED=""
 for F in $(find . -name "*.go" -o -name "*.sh" -o -name "*.cc" -o -name "*.h" \
 	-o -name "*.S" -o -name "*.py" -o -name "*.yml" -o -name "*.yaml" -o -name "*.fbs" \
-	-o \( -path "./sys/*/*.txt" \) | egrep -v "/vendor/|/gen/|/testdata/"); do
+	-o \( -path "./sys/*/*.txt" \) | egrep -v "/_include/|/vendor/|/gen/|/testdata/"); do
 	((FILES+=1))
 	cat $F | tr '\n' '_' | egrep "(//|#) Copyright 20[0-9]{2}(/20[0-9]{2})? syzkaller project authors\. All rights reserved\._(//|#) Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file\." >/dev/null
 	if [ $? -eq 0 ]; then continue; fi
-- 
cgit mrf-deployment