From 2277260373b1bb865a948164ef8e3ceb1ac4a49b Mon Sep 17 00:00:00 2001 From: Holden Warriner Date: Mon, 6 Nov 2023 09:10:04 -0500 Subject: [PATCH] Use installable lib as Evergreen loader's data dep (#1889) This change was made a while ago, in https://github.com/youtube/cobalt/pull/117, but then reverted in https://github.com/youtube/cobalt/pull/500. I think the original change was reverted either accidentally or to get symbols included in gtest binaries. But if it was reverted in order to get symbols in gtest binaraies, that should now be covered by https://github.com/youtube/cobalt/pull/1857. b/268244534 b/192672173 Change-Id: Iacc32af77c1a192136863872f361de4a50d566e0 --- starboard/build/config/BUILDCONFIG.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starboard/build/config/BUILDCONFIG.gn b/starboard/build/config/BUILDCONFIG.gn index 2ed6357641ab..e0c8fa2cb78f 100644 --- a/starboard/build/config/BUILDCONFIG.gn +++ b/starboard/build/config/BUILDCONFIG.gn @@ -393,7 +393,7 @@ template("evergreen_loader") { copy("copy_loader_app_lib${original_target_name}") { install_content = true if (target_cpu == "arm" && arm_float_abi == "softfp") { - sources = [ "$root_out_dir/../evergreen-$target_cpu-${arm_float_abi}_$build_type/lib${original_target_name}.so" ] + sources = [ "$root_out_dir/../evergreen-$target_cpu-${arm_float_abi}_$build_type/install/lib/lib${original_target_name}.so" ] } else if (target_cpu == "arm64") { sources = [ "$root_out_dir/../evergreen-$target_cpu_$build_type/install/lib/libcobalt.so" ] }