From 347ec9477ce414f1f0bf0fe1c549785145c5cca5 Mon Sep 17 00:00:00 2001 From: Max Zhang <60412045+maxz-lab@users.noreply.github.com> Date: Wed, 18 Oct 2023 16:17:11 -0700 Subject: [PATCH] Fix RDK launcher to read binary from install folder (#1818) Fix a bug where the launcher script copies the binaries from. The correct path is install/lib. b/293172465 --- starboard/evergreen/shared/launcher.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/starboard/evergreen/shared/launcher.py b/starboard/evergreen/shared/launcher.py index c74eb7c253a6..1a6536646c9e 100644 --- a/starboard/evergreen/shared/launcher.py +++ b/starboard/evergreen/shared/launcher.py @@ -282,8 +282,6 @@ def _StageTargetsAndContentsRaspi(self): def _StageTargetsAndContentsRdk(self): """Stage targets and their contents for GN builds for RDK platforms.""" - content_subdir = os.path.join('usr', 'share', 'cobalt') - # The rdk loader always loads libcobalt.so. Hard code target_name to match. rdk_target_name = 'cobalt' @@ -300,7 +298,8 @@ def _StageTargetsAndContentsRdk(self): shutil.copytree(target_content_src, target_content_dst) shlib_name = f'lib{self.target_name}.so' - target_binary_src = os.path.join(self.out_directory, shlib_name) + target_binary_src = os.path.join(self.out_directory, 'install', 'lib', + shlib_name) target_binary_dst = os.path.join(target_staging_dir, 'lib', f'lib{rdk_target_name}.so')