From fa5f8fa7e84065b92ae9a73e37d434ec206c1ee8 Mon Sep 17 00:00:00 2001
From: Kevin King <kcking@google.com>
Date: Tue, 2 Jan 2024 10:01:27 -0800
Subject: [PATCH] Depend on upb_generator:mangle from rust compiler

Update cmake to include necessary upb_generator files and upb namespace.

PiperOrigin-RevId: 595144470
---
 CMakeLists.txt                                | 2 ++
 src/google/protobuf/compiler/rust/BUILD.bazel | 1 +
 src/libprotoc.map                             | 1 +
 3 files changed, 4 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f78fccc27a..4fae55bb80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,6 +279,8 @@ endif (MSVC)
 include_directories(
   ${ZLIB_INCLUDE_DIRECTORIES}
   ${protobuf_BINARY_DIR}
+  # Support #include-ing other top-level directories, i.e. upb_generator.
+  ${protobuf_SOURCE_DIR}
   ${protobuf_SOURCE_DIR}/src)
 
 set(protobuf_ABSL_PROVIDER "module" CACHE STRING "Provider of absl library")
diff --git a/src/google/protobuf/compiler/rust/BUILD.bazel b/src/google/protobuf/compiler/rust/BUILD.bazel
index 03212d1bae..3dd9b247aa 100644
--- a/src/google/protobuf/compiler/rust/BUILD.bazel
+++ b/src/google/protobuf/compiler/rust/BUILD.bazel
@@ -44,6 +44,7 @@ cc_library(
         ":oneof",
         "//src/google/protobuf:protobuf_nowkt",
         "//src/google/protobuf/compiler/cpp:names",
+        "//upb_generator:mangle",
         "@com_google_absl//absl/log:absl_check",
         "@com_google_absl//absl/log:absl_log",
     ],
diff --git a/src/libprotoc.map b/src/libprotoc.map
index 6f3a36e481..24a5f76a55 100644
--- a/src/libprotoc.map
+++ b/src/libprotoc.map
@@ -3,6 +3,7 @@
     extern "C++" {
       *google*;
       pb::*;
+      upb::*;
     };
     scc_info_*;
     descriptor_table_*;