From 1de1fba1149e38f69fca40e859e5c0667f41faf8 Mon Sep 17 00:00:00 2001
From: Ilya Maykov <ilyam@squareup.com>
Date: Mon, 18 Nov 2024 17:19:13 -0800
Subject: [PATCH] Update nanopb to 0.4.9 and remove now-unnecessary hack from
 proto/CMakeLists.txt

---
 core/nanopb               | 2 +-
 core/proto/CMakeLists.txt | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/nanopb b/core/nanopb
index c9124132..98bf4db6 160000
--- a/core/nanopb
+++ b/core/nanopb
@@ -1 +1 @@
-Subproject commit c9124132a604047d0ef97a09c0e99cd9bed2c818
+Subproject commit 98bf4db69897b53434f3d0ba72e0a3ab1a902824
diff --git a/core/proto/CMakeLists.txt b/core/proto/CMakeLists.txt
index 30dd40ac..aa717e35 100644
--- a/core/proto/CMakeLists.txt
+++ b/core/proto/CMakeLists.txt
@@ -8,9 +8,6 @@ set(protos
     "${CMAKE_CURRENT_LIST_DIR}/squareup/subzero/service.proto"
 )
 
-# The next 2 lines are needed to build with nanopb 0.4.5. Can be removed if we update to 0.4.7.
-set(NANOPB_GENERATE_CPP_APPEND_PATH FALSE)
-set(NANOPB_OPTIONS "-I${CMAKE_CURRENT_LIST_DIR}/")
 nanopb_generate_cpp(PROTO_SRCS PROTO_HDRS ${protos} RELPATH ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 set_source_files_properties(${PROTO_SRCS} ${PROTO_HDRS}