mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

CICD: Improve Location of Scripts for the Android Build Environment.

Browse source 
Move around the scripts required for the setup of the build environment
for android to satisfy docker's requirement of locality.
This allows the removal of an extra copy step, and avoids the creation
of extra artefacts, while still providing the same functionality.

Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
Michael Keller 2024-01-08 07:51:43 +13:00
parent ec83e157e9
commit b5efaf661c
8 changed files with 4 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packaging/android/qmake-build.sh
View file

@ -4,7 +4,7 @@
#
# this requires Qt5.14 or newer with matching NDK
#
# the packaging/android/android-build-setup.sh sets up an environment that works for this
# the scripts/docker/android-build-container/android-build-setup.sh sets up an environment that works for this
set -eu
@ -22,7 +22,7 @@ popd
BUILD_TYPE=Debug
# Read build variables
source $SUBSURFACE_SOURCE/packaging/android/variables.sh
source $SUBSURFACE_SOURCE/scripts/docker/android-build-container/variables.sh
# this assumes that the Subsurface source directory is in the same
# directory hierarchy as the SDK and NDK