Skip to content

Commit

Permalink
Build all targets for loader platform
Browse files Browse the repository at this point in the history
  • Loading branch information
oxve committed May 16, 2024
1 parent 75201ef commit 8d8de60
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/actions/build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ runs:
fi
else
BUILD_PLATFORM=${COBALT_EVERGREEN_LOADER}
BUILD_TARGET='loader_app_install elf_loader_sandbox_install native_target/crashpad_handler'
# TODO(oxv): Don't build everything?
BUILD_TARGET=all
fi
# GitHub Runners have home set to /github/home.
if [ -d /root/starboard-toolchains ]; then
Expand Down
14 changes: 11 additions & 3 deletions starboard/evergreen/shared/launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ def __init__(self, platform, target_name, config, device_id, **kwargs):
env_variables['ASAN_OPTIONS'] = ':'.join(asan_options)
kwargs['env_variables'] = env_variables

# pylint: disable=super-with-arguments
super().__init__(platform, target_name, config, device_id, **kwargs)

self.loader_platform = kwargs.get('loader_platform')
if not self.loader_platform:
raise ValueError('|loader_platform| cannot be |None|.')
Expand All @@ -65,6 +62,14 @@ def __init__(self, platform, target_name, config, device_id, **kwargs):
if not self.loader_config:
raise ValueError('|loader_config| cannot be |None|.')

# Add the suffix if running android-arm. APKs built for evergreen have
# the suffix appended to differentiate them from monolithic builds.
if 'android-arm' in self.loader_platform:
target_name = target_name + '_evergreen_loader'

# pylint: disable=super-with-arguments
super().__init__(platform, target_name, config, device_id, **kwargs)

# RDK doesn't use our loader, therefore the test files are stored
# in the folder named after the target
if 'rdk' in self.loader_platform:
Expand Down Expand Up @@ -184,6 +189,9 @@ def _StageTargetsAndContents(self):
self._StageTargetsAndContentsRaspi()
elif 'rdk' in self.loader_platform:
self._StageTargetsAndContentsRdk()
elif 'android-arm' in self.loader_platform:
# No staging necessary for android-arm.
return
else:
raise ValueError(f"'{self.loader_platform}' is not recognized")

Expand Down

0 comments on commit 8d8de60

Please sign in to comment.