From be169156ee8e630d116aacde42342baddf466a35 Mon Sep 17 00:00:00 2001
From: Max Zhang <60412045+maxz-lab@users.noreply.github.com>
Date: Mon, 13 May 2024 11:39:50 -0700
Subject: [PATCH] Refine the build toolchain requirement for _abi_wrapper
 (#3202)

Refine the build toolchain requirement for _abi_wrapper

b/330771976
---
 starboard/elf_loader/BUILD.gn     | 5 ++++-
 starboard/shared/modular/BUILD.gn | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/starboard/elf_loader/BUILD.gn b/starboard/elf_loader/BUILD.gn
index 379a002dc658..60c658f5fa29 100644
--- a/starboard/elf_loader/BUILD.gn
+++ b/starboard/elf_loader/BUILD.gn
@@ -58,9 +58,12 @@ static_library("elf_loader") {
     ":evergreen_info",
     "//starboard:starboard_group",
     "//starboard/common",
-    "//starboard/shared/modular:starboard_layer_posix_abi_wrappers",
     "//third_party/lz4_lib:lz4",
   ]
+
+  if (current_toolchain == starboard_toolchain) {
+    deps += [ "//starboard/shared/modular:starboard_layer_posix_abi_wrappers" ]
+  }
 }
 
 if (sb_is_evergreen_compatible && current_toolchain == starboard_toolchain) {
diff --git a/starboard/shared/modular/BUILD.gn b/starboard/shared/modular/BUILD.gn
index 59d627a18485..a7d96659bfed 100644
--- a/starboard/shared/modular/BUILD.gn
+++ b/starboard/shared/modular/BUILD.gn
@@ -15,8 +15,7 @@
 # TODO: b/315170518 - Revert to static library after fixing
 # symbol visibility issues for windows based modular platform builds.
 if ((sb_is_modular || sb_is_evergreen_compatible) &&
-    (current_toolchain == starboard_toolchain ||
-     build_with_separate_cobalt_toolchain)) {
+    current_toolchain == starboard_toolchain) {
   source_set("starboard_layer_posix_abi_wrappers") {
     sources = [
       "starboard_layer_posix_mmap_abi_wrappers.cc",