9 files changed, 151 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 370655c..15b68b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,6 @@ include(external/FirebaseCore)
 include(external/googletest)
 include(external/leveldb)
 include(external/grpc)
-include(external/firestore)
 include(external/protobuf)
 include(external/nanopb)
+include(external/firestore)
diff --git a/Firestore/CMakeLists.txt b/Firestore/CMakeLists.txt
index b8c95c6..25f27fa 100644
--- a/Firestore/CMakeLists.txt
+++ b/Firestore/CMakeLists.txt
@@ -47,6 +47,7 @@ add_library(
 
 find_package(LevelDB REQUIRED)
 find_package(GRPC REQUIRED)
+find_package(Nanopb REQUIRED)
 
 if(APPLE)
   find_package(FirebaseCore REQUIRED)
@@ -63,4 +64,7 @@ include_directories(${FIREBASE_INSTALL_DIR})
 # Fully qualified imports, project wide
 include_directories(${FIREBASE_SOURCE_DIR})
 
+# Include nanopb generated sources
+include_directories(${FIREBASE_SOURCE_DIR}/Firestore/Protos/nanopb)
+
 add_subdirectory(core)
diff --git a/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt b/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt
index 43320ce..a218e3b 100644
--- a/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt
+++ b/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt
@@ -17,6 +17,9 @@ cc_library(
   SOURCES
     datastore.h
     datastore.cc
+    serializer.h
+    serializer.cc
   DEPENDS
     grpc::grpc
+    nanopb
 )
diff --git a/Firestore/core/src/firebase/firestore/remote/serializer.cc b/Firestore/core/src/firebase/firestore/remote/serializer.cc
new file mode 100644
index 0000000..1831222
--- /dev/null
+++ b/Firestore/core/src/firebase/firestore/remote/serializer.cc
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "Firestore/core/src/firebase/firestore/remote/serializer.h"
+
+// TODO(rsgowman): These are (currently!) unnecessary includes. Adding for now
+// to ensure we can find nanopb's generated header files.
+#include "Firestore/Protos/nanopb/google/protobuf/timestamp.pb.h"
+#include "Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.h"
+
+
+namespace firebase {
+namespace firestore {
+namespace remote {
+
+Serializer::Serializer() {
+}
+
+}  // namespace remote
+}  // namespace firestore
+}  // namespace firebase
diff --git a/Firestore/core/src/firebase/firestore/remote/serializer.h b/Firestore/core/src/firebase/firestore/remote/serializer.h
new file mode 100644
index 0000000..4dc6b9e
--- /dev/null
+++ b/Firestore/core/src/firebase/firestore/remote/serializer.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_REMOTE_SERIALIZER_H_
+#define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_REMOTE_SERIALIZER_H_
+
+namespace firebase {
+namespace firestore {
+namespace remote {
+
+/**
+ * @brief Converts internal model objects to their equivalent protocol buffer
+ * form.
+ *
+ * Methods starting with "Encode" convert to a protocol buffer and methods
+ * starting with "Decode" convert from a protocol buffer.
+ *
+ */
+// TODO(rsgowman): Original docs also has this: "Throws an exception if a
+// protocol buffer is missing a critical field or has a value we can't
+// interpret." Adjust for C++.
+class Serializer {
+ public:
+  // TODO(rsgowman): Adjust ctor to accept a DatabaseID... once that exists.
+  Serializer(/*DatabaseID databaseId*/);
+};
+
+}  // namespace remote
+}  // namespace firestore
+}  // namespace firebase
+
+#endif  // FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_REMOTE_SERIALIZER_H_
diff --git a/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt b/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt
index 7d99e6f..d42b107 100644
--- a/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt
+++ b/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt
@@ -16,6 +16,7 @@ cc_test(
   firebase_firestore_remote_test
   SOURCES
     datastore_test.cc
+    serializer_test.cc
   DEPENDS
     firebase_firestore_remote
 )
diff --git a/Firestore/core/test/firebase/firestore/remote/serializer_test.cc b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc
new file mode 100644
index 0000000..6a58adb
--- /dev/null
+++ b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "Firestore/core/src/firebase/firestore/remote/serializer.h"
+
+#include <pb_encode.h>
+#include <gtest/gtest.h>
+
+TEST(Serializer, CanLinkToNanopb) {
+  // This test doesn't actually do anything interesting as far as actually using
+  // nanopb is concerned but that it can run at all is proof that all the
+  // libraries required for nanopb to work are actually linked correctly into
+  // the test.
+  pb_ostream_from_buffer(NULL, 0);
+}
diff --git a/cmake/FindNanopb.cmake b/cmake/FindNanopb.cmake
new file mode 100644
index 0000000..fab6f4a
--- /dev/null
+++ b/cmake/FindNanopb.cmake
@@ -0,0 +1,34 @@
+include(FindPackageHandleStandardArgs)
+
+set(BINARY_DIR ${FIREBASE_INSTALL_DIR}/external/nanopb)
+
+find_path(
+  NANOPB_INCLUDE_DIR pb.h
+  HINTS ${BINARY_DIR}/src/nanopb
+)
+
+find_library(
+  NANOPB_LIBRARY
+  NAMES protobuf-nanopb protobuf-nanopbd
+  HINTS ${BINARY_DIR}/src/nanopb-build
+)
+
+find_package_handle_standard_args(
+  nanopb
+  DEFAULT_MSG
+  NANOPB_INCLUDE_DIR
+  NANOPB_LIBRARY
+)
+
+if(NANOPB_FOUND)
+  set(NANOPB_INCLUDE_DIRS ${NANOPB_INCLUDE_DIR} )
+
+  if (NOT TARGET nanopb)
+    add_library(nanopb UNKNOWN IMPORTED)
+    set_target_properties(
+      nanopb PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES ${NANOPB_INCLUDE_DIRS}
+      IMPORTED_LOCATION ${NANOPB_LIBRARY}
+    )
+  endif()
+endif(NANOPB_FOUND)
diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index 1a89435..94f7cae 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -21,6 +21,7 @@ ExternalProject_Add(
     googletest
     leveldb
     grpc
+    nanopb
 
   # Lay the binary directory out as if this were a subproject. This makes it
   # possible to build and test in it directly.