commit af5eeeb054bebadfbb79c7bcd100a95e2ad4525f
author Junji Watanabe <jwata@google.com> Wed Nov 19 07:56:51 2025
committer Junji Watanabe <jwata@google.com> Wed Nov 19 07:58:08 2025
tree 1c758a0853e56e755cc16fa081314c24888435e1
parent e2c93c34982b286b27ce8b56dd7159e0b90869a2

Add msan runtime deps when necessary

`nasm` binary is failing to run remotely when MSan is enabled due to missing runtime deps. (See also http://crbug.com/450862240#comment7)

This CL adds the missing deps like `proto_library` does.
https://source.chromium.org/chromium/chromium/src/+/main:third_party/protobuf/proto_library.gni;l=486-490;drc=18b913a11ad3045130af7bc90988eea862b84398

This CL needs https://crrev.com/c/7171340 before submitting.

Bug: 450862240
Change-Id: I52eb40366ab5a05246fb29371323b96ed15a782c

nasm_assemble.gni

diff --git a/nasm_assemble.gni b/nasm_assemble.gni
index b4667a9..3464522 100644
--- a/nasm_assemble.gni
+++ b/nasm_assemble.gni
@@ -44,6 +44,7 @@
 import("//build/compiled_action.gni")
 import("//build/config/ios/config.gni")
 import("//build/config/ios/ios_sdk_overrides.gni")
+import("//build/config/sanitizers/sanitizers.gni")
 if (is_mac) {
   import("//build/config/mac/mac_sdk.gni")
 }
@@ -113,6 +114,16 @@
                              "deps",
                            ])
 
+    if (!defined(deps)) {
+      deps = []
+    }
+    if (host_toolchain_is_msan) {
+      deps += [ "//third_party/instrumented_libs:ld-linux($host_toolchain)" ]
+      configs = [
+        "//third_party/instrumented_libs:msan_runtime_libs($host_toolchain)",
+      ]
+    }
+
     # Flags.
     args = _nasm_flags
     if (defined(invoker.nasm_flags)) {