Cherry pick netsim build fix

From 655de58, minus a temporary fix undo.

Bug: 463790471

Author: cjreynol

base/cvd/BUILD.android_tools_netsim.bazel

@@ -230,6 +230,17 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "netsim_daemon_ffi_cc_library",
+    srcs = ["netsim-daemon/src/ffi.rs.cc"],
+    hdrs = ["netsim-daemon/src/ffi.rs.h"],
+    deps = [
+        ":lib-netsim",
+    ],
+    alwayslink = True,
+    linkstatic = True,
+)
+
 rust_library(
     name = "libnetsim_daemon",
     srcs = glob([
@@ -271,6 +282,7 @@ cc_binary(
     deps = [
         ":lib-netsim",
         ":libnetsim_daemon",
+        ":netsim_daemon_ffi_cc_library",
         ":netsim_cc_proto",
         "@grpc//:grpc++",
         "@netsim_crates//:grpcio-sys",

base/cvd/MODULE.bazel

@@ -13,7 +13,7 @@ bazel_dep(name = "boringssl", version = "0.20241024.0")
 bazel_dep(name = "brotli", version = "1.1.0")
 bazel_dep(name = "crc32c", version = "1.1.0")
 bazel_dep(name = "curl", version = "8.8.0.bcr.2")
-bazel_dep(name = "cxx.rs", version = "1.0.168")
+bazel_dep(name = "cxx.rs", version = "1.0.188")
 bazel_dep(name = "fmt", version = "11.2.0.bcr.1")
 bazel_dep(name = "freetype", version = "2.13.3")
 bazel_dep(name = "gflags", version = "2.2.2")
@@ -754,6 +754,7 @@ git_repository(
     patches = [
         "@//build_external/netsim:0001-Drop-pica-from-daemon-Cargo.toml.patch",
         "@//build_external/netsim:0002-Fix-build-with-tungstenite-0.26.0.patch",
+        "@//build_external/netsim:0003-Pin-cxx.patch",
     ],
     patch_strip = 1,
 )

base/cvd/build_external/netsim/0003-Pin-cxx.patch

@@ -0,0 +1,13 @@
+diff --git a/rust/daemon/Cargo.toml b/rust/daemon/Cargo.toml
+index 30f705ad..3a1819d4 100644
+--- a/rust/daemon/Cargo.toml
++++ b/rust/daemon/Cargo.toml
+@@ -11,7 +11,7 @@ doctest = false
+ [dependencies]
+ bytes = { version = ">=1.4.0"}
+ clap = { version = "4.1.8", default-features = false, features = ["derive", "error-context", "help", "std", "usage", "env" ] }
+-cxx = { version = ">=1.0.85", features = ["c++17"] }
++cxx = { version = "=1.0.188", features = ["c++17"] }
+ data-encoding = "2.4.0"
+ futures = "0.3.30"
+ glam = { version = "0.25.0", features = ["libm"] }

base/debian/changelog

@@ -1,3 +1,9 @@
+cuttlefish-common (1.29.1) UNRELEASED; urgency=medium
+
+  * Pin cxx dependency in netsim to fix build
+
+ -- Chad Reynolds <[email protected]>  Wed, 26 Nov 2025 14:04:08 -0800
+
 cuttlefish-common (1.29.0) stable; urgency=medium
 
   * Start development on v1.29 by @ser-io in https://github.com/google/android-cuttlefish/pull/1713