commit 09d7ffaef243ffcb6695f6f4015d061c78406c28
author Austin Schuh <austin.linux@gmail.com> Thu Oct 03 23:43:34 2019 -0700
committer Austin Schuh <austin.linux@gmail.com> Sat Oct 19 17:31:29 2019 -0700
tree 0affed7d294a846d5c63e632fa3460576b6d7fef
parent d7e252dfc4c196a328d11ea4e10ae60a18920141

Add a flatbuffer merge function

The second value wins.  Vectors get appended.  Nested objects get both
merged.

Change-Id: I1cb3f65b57d7cf219fca3c6d8dbb8418f8a0d697

aos/BUILD

diff --git a/aos/BUILD b/aos/BUILD
index 95418ea..46aa1b9 100644
--- a/aos/BUILD
+++ b/aos/BUILD
@@ -458,3 +458,27 @@
         "//aos/testing:googletest",
     ],
 )
+
+cc_library(
+    name = "flatbuffer_merge",
+    srcs = ["flatbuffer_merge.cc"],
+    hdrs = ["flatbuffer_merge.h"],
+    copts = ["-Wno-cast-align"],
+    deps = [
+        ":flatbuffer_utils",
+        "@com_github_google_flatbuffers//:flatbuffers",
+    ],
+)
+
+cc_test(
+    name = "flatbuffer_merge_test",
+    srcs = [
+        "flatbuffer_merge_test.cc",
+    ],
+    deps = [
+        ":flatbuffer_merge",
+        ":json_to_flatbuffer",
+        ":json_to_flatbuffer_flatbuffer",
+        "//aos/testing:googletest",
+    ],
+)