commit 13ec0723e5ccafdea3ee6df11d33c3edf2f10c29
author Austin Schuh <austin.linux@gmail.com> Mon Sep 26 18:12:16 2022 -0700
committer Austin Schuh <austin.linux@gmail.com> Mon Sep 26 18:12:16 2022 -0700
tree 20b561f8a48a8753a26631066edc2e1c0891a984
parent db60509085c8b2e5c4971a33c756d8cfaa96e1dd

Remove bazel-bin/... from reflection.fbs include path

The flatbuffer compiler was baking in the bazel-bin folder for
reflection.fbs into the schemas in the configuration.  That's not
ideal...  Remove that path.

I need to figure out how to rectify this with upstream at some point so
we can start beating the differences down again.

Change-Id: I32d39072f8b66f3f3a24ffdb58b31aae7273d1c7
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

aos/events/logging/logger_test.cc

diff --git a/aos/events/logging/logger_test.cc b/aos/events/logging/logger_test.cc
index 73e039e..62648f1 100644
--- a/aos/events/logging/logger_test.cc
+++ b/aos/events/logging/logger_test.cc
@@ -3745,11 +3745,11 @@
 }
 
 constexpr std::string_view kCombinedConfigSha1(
-    "46f8daa7d84eb999c8d3584b79f4a289fd46e3a0b47a08bdbee9c7e3b89b4aff");
+    "c10ca3c1efa7924d48859000b6671eadc007b6373c81d07138a385dfdbb33d69");
 constexpr std::string_view kSplitConfigSha1(
-    "53978a9c089e8f5a525503ce18aca6146a7a9dee450b6067580ed952a1ff08dd");
+    "f8df4ee52e137025dac96303f8d38a5324fd819d1c22ff018754dd56c3ca64e8");
 constexpr std::string_view kReloggedSplitConfigSha1(
-    "037fb89ada330db8908314b26bc7d96a6b3264984c189471d23b70ab6443ff96");
+    "3154b2a9f9819d676d40c689a6c2967c2c64152c2845673b78d0c1cdc368d3ec");
 
 INSTANTIATE_TEST_SUITE_P(
     All, MultinodeLoggerTest,

third_party/flatbuffers/src/idl_parser.cpp

diff --git a/third_party/flatbuffers/src/idl_parser.cpp b/third_party/flatbuffers/src/idl_parser.cpp
index 497e82b..524c996 100644
--- a/third_party/flatbuffers/src/idl_parser.cpp
+++ b/third_party/flatbuffers/src/idl_parser.cpp
@@ -3428,7 +3428,9 @@
 
     if (included_files_.find(source_hash) == included_files_.end()) {
       included_files_[source_hash] = include_filename ? include_filename : "";
-      files_included_per_file_[source_filename] = std::set<IncludedFile>();
+      files_included_per_file_[include_filename ? include_filename
+                                                : source_filename] =
+          std::set<IncludedFile>();
     } else {
       return NoError();
     }
@@ -3480,7 +3482,9 @@
         IncludedFile included_file;
         included_file.filename = filepath;
         included_file.schema_name = name;
-        files_included_per_file_[source_filename].insert(included_file);
+        files_included_per_file_[include_filename ? include_filename
+                                                  : source_filename]
+            .insert(included_file);
       }
 
       std::string contents;