Pin cxx dependency in netsim to fix build

As of version 1.0.89, cxx started versioning their generated symbols to
detect version mismatches between the version of cxx used for rust and
c++ code in the same project. Netsim was automatically using the latest
cxx, while bazel was pinned at 1.0.68. The bazel registry only goes up
to 1.0.88, so pin both projects there.

See https://www.github.com/dtolnay/cxx/pull/1665

Bug: b/462513519

Author: Databean

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")
@@ -758,6 +758,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/cvd/cuttlefish/package/BUILD.bazel

@@ -74,7 +74,7 @@ package_files(
         "cuttlefish-common/bin/ms-tpm-20-ref": "@ms-tpm-20-ref//:simulator",
         "cuttlefish-common/bin/mtools": "@mtools//:mtools",
         "cuttlefish-common/bin/netsim": "@android_tools_netsim//:netsim",
-        # "cuttlefish-common/bin/netsimd": "@android_tools_netsim//:netsimd",
+        "cuttlefish-common/bin/netsimd": "@android_tools_netsim//:netsimd",
         "cuttlefish-common/bin/openwrt_control_server": "//cuttlefish/host/commands/openwrt_control_server",
         "cuttlefish-common/bin/operator_proxy": "//cuttlefish/host/frontend/operator_proxy",
         "cuttlefish-common/bin/pica": "@netsim_crates//:pica__pica",