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>
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;