From a28a7a6319f9161fcc12bd7f6750b602a0d45513 Mon Sep 17 00:00:00 2001
From: "zijiehe@" <68449066+zijiehe-google-com@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:59:44 -0700
Subject: [PATCH] [fuchsia] Use the right versioned libs according to the
 target-api-level

---
 tools/fuchsia/fuchsia_libs.gni | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/fuchsia/fuchsia_libs.gni b/tools/fuchsia/fuchsia_libs.gni
index 519b6c8744b77..052f1676b6176 100644
--- a/tools/fuchsia/fuchsia_libs.gni
+++ b/tools/fuchsia/fuchsia_libs.gni
@@ -3,11 +3,11 @@
 # found in the LICENSE file.
 
 import("//flutter/tools/fuchsia/clang.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni")
 
-fuchsia_sdk_base = "//fuchsia/sdk/$host_os/arch/$target_cpu"
-fuchsia_sdk_dist = "$fuchsia_sdk_base/dist"
-sysroot_lib = "$fuchsia_sdk_base/sysroot/lib"
-sysroot_dist_lib = "$fuchsia_sdk_base/sysroot/dist/lib"
+fuchsia_sdk_dist = "$fuchsia_arch_root/dist"
+sysroot_lib = "$fuchsia_arch_root/sysroot/lib"
+sysroot_dist_lib = "$fuchsia_arch_root/sysroot/dist/lib"
 
 ld_so_path = ""
 libcxx_so_2_path = "${clang_manifest_json.md5_19df03aecdc9eb27bc8b4038352f2b27}"
@@ -85,7 +85,7 @@ if (is_asan) {
   ]
 }
 
-vulkan_dist = "$fuchsia_sdk_base/dist"
+vulkan_dist = "//fuchsia/sdk/$host_os/arch/$target_cpu/dist"
 
 # Note that the other validation libraries in the Fuchsia SDK seem to have a bug right
 # now causing crashes, so it is only recommended that we use