Breaking changes: remove deprecated code, return weak_ptr instead of raw, remove unused LogSink enum. More targetted docs.

.github/workflows/builds.yml

@@ -7,7 +7,6 @@ on:
       - src/**
       - include/**
       - cpp-example-collection/**
-      - bridge/**
       - client-sdk-rust/**
       - cmake/**
       - scripts/**
@@ -28,7 +27,6 @@ on:
       - src/**
       - include/**
       - cpp-example-collection/**
-      - bridge/**
       - client-sdk-rust/**
       - cmake/**
       - scripts/**
@@ -58,7 +56,7 @@ env:
   # failing the build.
   SCCACHE_GHA_ENABLED: "true"
   # Pinned commit for cpp-example-collection smoke build (https://github.com/livekit-examples/cpp-example-collection)
-  CPP_EXAMPLE_COLLECTION_REF: 56815733a71c14692569e8adf2916a56a14d4882
+  CPP_EXAMPLE_COLLECTION_REF: 402e6fbcc3cb8b2b2aaf80e21b289f27a9060dc6
   # vcpkg binary caching for Windows
   VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
   VCPKG_DEFAULT_HOST_TRIPLET: x64-windows-static-md

.github/workflows/docker-images.yml

@@ -6,7 +6,6 @@ on:
     paths:
       - src/**
       - include/**
-      - bridge/**
       - client-sdk-rust/**
       - CMakeLists.txt
       - build.sh
@@ -90,7 +89,7 @@ jobs:
             fi
 
             case "${path}" in
-              docker/Dockerfile.sdk|src/*|include/*|bridge/*|client-sdk-rust/*|cmake/*|data/*|CMakeLists.txt|build.sh|build.cmd|build.h.in|.build-info.json.in|CMakePresets.json)
+              docker/Dockerfile.sdk|src/*|include/*|client-sdk-rust/*|cmake/*|data/*|CMakeLists.txt|build.sh|build.cmd|build.h.in|.build-info.json.in|CMakePresets.json)
                 sdk_changed=true
                 ;;
             esac

.github/workflows/docker-validate.yml

@@ -11,7 +11,7 @@ permissions:
 
 env:
   # Pinned commit for cpp-example-collection smoke build (https://github.com/livekit-examples/cpp-example-collection)
-  CPP_EXAMPLE_COLLECTION_REF: 56815733a71c14692569e8adf2916a56a14d4882
+  CPP_EXAMPLE_COLLECTION_REF: 402e6fbcc3cb8b2b2aaf80e21b289f27a9060dc6
 
 jobs:
   validate-x64:

.github/workflows/license_check.yml

@@ -18,7 +18,7 @@ jobs:
           set -euo pipefail
 
           search_dirs=()
-          for dir in src include bridge cpp-example-collection; do
+          for dir in src include cpp-example-collection; do
             if [[ -d "$dir" ]]; then
               search_dirs+=("$dir")
             fi

AGENTS.md

@@ -74,7 +74,6 @@ Be sure to update the directory layout in this file if the directory layout chan
 | `src/` | Implementation files and internal-only headers (`ffi_client.h`, `lk_log.h`, etc.) |
 | `src/tests/` | Google Test integration and stress tests |
 | `examples/` | In-tree example applications |
-| `bridge/` | **Deprecated** C-style bridge layer — do not add new functionality |
 | `client-sdk-rust/` | Git submodule holding the Rust core of the SDK|
 | `client-sdk-rust/livekit-ffi/protocol/*.proto` | FFI contract (protobuf definitions, read-only reference) |
 | `cmake/` | Build helpers (`protobuf.cmake`, `spdlog.cmake`, `LiveKitConfig.cmake.in`) |
@@ -368,11 +367,6 @@ When adding new client facing functionality, add benchmarking to understand the
 - Declare all data objects at the smallest possible level of scope
 - Each calling function must check the return value of nonvoid functions, and each called function must check the validity of all parameters provided by the caller
 
-
-## Deprecated / Out of Scope
-
-- **`bridge/`** (`livekit_bridge`) is deprecated. Do not add new functionality to it.
-
 ## Common Pitfalls
 
 - A `Room` with `auto_subscribe = false` will never receive remote audio/video frames — this is almost never what you want.

CMakeLists.txt

@@ -14,6 +14,7 @@ project(livekit VERSION ${LIVEKIT_PROJECT_VERSION} LANGUAGES C CXX)
 set(LIVEKIT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(LIVEKIT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+include(warnings)
 
 option(LIVEKIT_BUILD_EXAMPLES "Build LiveKit examples" OFF)
 option(LIVEKIT_BUILD_TESTS "Build LiveKit tests" OFF)
@@ -113,17 +114,28 @@ if(TARGET protobuf::libprotobuf)
 else()
   message(FATAL_ERROR "No protobuf library target found (expected protobuf::libprotobuf)")
 endif()
-target_include_directories(livekit_proto PRIVATE
-  "${PROTO_BINARY_DIR}"
-  ${Protobuf_INCLUDE_DIRS}
-)
-target_link_libraries(livekit_proto PRIVATE ${LIVEKIT_PROTOBUF_TARGET})
+set(LIVEKIT_PROTOBUF_DEP_INCLUDE_DIRS ${Protobuf_INCLUDE_DIRS})
 if(TARGET absl::base)
-  get_target_property(_absl_inc absl::base INTERFACE_INCLUDE_DIRECTORIES)
+  livekit_get_interface_includes(absl::base _absl_inc)
   if(_absl_inc)
-    target_include_directories(livekit_proto PRIVATE ${_absl_inc})
+    list(APPEND LIVEKIT_PROTOBUF_DEP_INCLUDE_DIRS ${_absl_inc})
   endif()
 endif()
+set(LIVEKIT_SYSTEM_INCLUDE_DIRS)
+if(TARGET spdlog::spdlog)
+  livekit_get_interface_includes(spdlog::spdlog _spdlog_inc)
+  if(_spdlog_inc)
+    list(APPEND LIVEKIT_SYSTEM_INCLUDE_DIRS ${_spdlog_inc})
+  endif()
+endif()
+target_include_directories(livekit_proto SYSTEM PRIVATE
+  "${PROTO_BINARY_DIR}"
+)
+target_include_directories(livekit_proto PRIVATE
+  ${LIVEKIT_PROTOBUF_DEP_INCLUDE_DIRS}
+)
+target_link_libraries(livekit_proto PRIVATE ${LIVEKIT_PROTOBUF_TARGET})
+livekit_disable_warnings(livekit_proto)
 
 # Manually generate protobuf files to avoid path prefix issues
 set(PROTO_SRCS)
@@ -432,8 +444,13 @@ target_include_directories(livekit
   PRIVATE
     ${LIVEKIT_ROOT_DIR}/src
     ${LIVEKIT_ROOT_DIR}/src/trace
-    ${RUST_ROOT}/livekit-ffi/include
-    ${PROTO_BINARY_DIR}
+    ${LIVEKIT_PROTOBUF_DEP_INCLUDE_DIRS}
+)
+
+target_include_directories(livekit SYSTEM PRIVATE
+  ${RUST_ROOT}/livekit-ffi/include
+  ${PROTO_BINARY_DIR}
+  ${LIVEKIT_SYSTEM_INCLUDE_DIRS}
 )
 
 target_link_libraries(livekit
@@ -748,9 +765,6 @@ install(FILES
 
 # ------------------------------------------------------------------------
 
-# Build the LiveKit C++ bridge before examples (human_robot depends on it)
-add_subdirectory(bridge)
-
 if(LIVEKIT_BUILD_EXAMPLES)
   include(cpp-example-collection)
   livekit_configure_cpp_example_collection()

DEPENDENCIES.md

@@ -254,6 +254,6 @@ To verify you have all dependencies linked correctly:
 
 ## Need Help?
 
-- See `README_BUILD.md` for complete build instructions
+- See [`docs/building.md`](docs/building.md) for complete build instructions
 - Check `CMakeLists.txt` lines 287-381 for the exact CMake configuration
 - Open an issue at: https://github.com/livekit/client-sdk-cpp/issues