From 10b28bfc31afb2bae82cca61d2523b48f80ad13e Mon Sep 17 00:00:00 2001 From: cobalt-github-releaser-bot <95661244+cobalt-github-releaser-bot@users.noreply.github.com> Date: Tue, 9 Jul 2024 17:28:36 -0700 Subject: [PATCH] Cherry pick PR #3763: Use toolchain defined in starboard path (#3796) Refer to the original PR: https://github.com/youtube/cobalt/pull/3763 This prevents the duplication of native_target toolchain if it's defined in both path android/arm/toolchain and $starboard_path/toolchain b/291130824 --------- Co-authored-by: Rongo Li <57740755+Rongo-JL@users.noreply.github.com> Co-authored-by: Kaido Kert --- starboard/loader_app/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starboard/loader_app/BUILD.gn b/starboard/loader_app/BUILD.gn index da5eaee6649e..c0ac9825e71d 100644 --- a/starboard/loader_app/BUILD.gn +++ b/starboard/loader_app/BUILD.gn @@ -74,7 +74,7 @@ if (sb_is_evergreen_compatible && sb_evergreen_compatible_package) { install_content = true sources = [ "$root_out_dir/native_target/crashpad_handler" ] outputs = [ "$root_out_dir/libcrashpad_handler.so" ] - deps = [ "//third_party/crashpad/handler:crashpad_handler(//starboard/android/arm/toolchain:native_target)" ] + deps = [ "//third_party/crashpad/handler:crashpad_handler(//$starboard_path/toolchain:native_target)" ] } }