From cf5d9c7a28a11e6780b0dc69e9d8dc562cc724f6 Mon Sep 17 00:00:00 2001 From: Mukilan Thiyagarajan Date: Tue, 23 Jan 2024 11:07:33 +0530 Subject: [PATCH] ci: fix reference to android job filename in main.yml (#31150) * ci: fix reference to android job filename in main.yml * mach: fix build command to handle android The refactoring done in PR #31092 introduced the call to get_binary_path in the unconditional path, but did not pass the android flag to the call. Signed-off-by: Mukilan Thiyagarajan --------- Signed-off-by: Mukilan Thiyagarajan --- .github/workflows/main.yml | 2 +- python/servo/build_commands.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 649f66a4d82..600be396d4d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -129,7 +129,7 @@ jobs: name: Android needs: ["decision"] if: ${{ contains(fromJson(needs.decision.outputs.configuration).platforms, 'android') }} - uses: ./.github/workflows/linux.yml + uses: ./.github/workflows/android.yml with: profile: "release" secrets: inherit diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index dd63aff54f3..afed8dbc5c2 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -104,7 +104,13 @@ class MachCommands(CommandBase): ) # Do some additional things if the build succeeded - built_binary = self.get_binary_path(build_type, target=self.cross_compile_target, simpleservo=libsimpleservo) + built_binary = self.get_binary_path( + build_type, + target=self.cross_compile_target, + android=self.is_android_build, + simpleservo=libsimpleservo + ) + if status == 0: if self.is_android_build and not no_package: flavor = None