diff --git a/system-images/android/sdk/build-cmake-native b/system-images/android/sdk/build-cmake-native index f1ddb35..0b76745 100755 --- a/system-images/android/sdk/build-cmake-native +++ b/system-images/android/sdk/build-cmake-native @@ -1,27 +1,27 @@ #!/bin/bash set -e name=$1 shift repo=$1 shift srcdir=`pwd`/src if ! [ -d $srcdir/$name ] ; then mkdir -p $srcdir cd $srcdir - git clone $repo --single-branch + git clone $repo --single-branch $GIT_EXTRA fi mkdir build/$name -p pushd build/$name cmake $srcdir/$name/$EXTRA $@ cmake --build . -- install -j`nproc` popd if [ "$PERSIST" ]; then echo "leaving the build directory" else rm -rf build/$name fi diff --git a/system-images/android/sdk/build-generic b/system-images/android/sdk/build-generic index aab2da6..f33c1e4 100755 --- a/system-images/android/sdk/build-generic +++ b/system-images/android/sdk/build-generic @@ -1,58 +1,58 @@ #!/bin/bash set -e # trap 'err_report echo "error: ${BASH_SOURCE}":"${LINENO}"' exit 1 package=$1 shift DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH=$DIR:$PATH # we get the repositories for the dependencies git clone kde:sysadmin/ci-tooling || true pushd ci-tooling git clone kde:sysadmin/repo-metadata || true git clone kde:kde-build-metadata || true popd # we figure out the dependencies all_packages=$(python3 ci-tooling/helpers/list-dependencies.py $package --platform AndroidQt5.10) echo "Dependencies to build: $all_packages" blacklist="oxygen breeze oxygen-icons5 $package" for a in $extrapackages $all_packages do if [[ "$blacklist" =~ "$a" ]]; then continue fi arguments=$(python3 ci-tooling/helpers/getsetting.py --project $a --product Frameworks --platform AndroidQt5.10 --key cmake-options) build-cmake $a kde:$a $arguments -DBUILD_TESTING=OFF -GNinja done # we now do the actual application separately # first we download the project and look for the manifest file pushd src git clone kde:$package || true popd manifestFile=`find $(pwd)/src/$package -name AndroidManifest.xml` EXTRA= if [ -n "$manifestFile" ] then targetname=`python3 $DIR/target-from-manifest.py $manifestFile` EXTRA=-DANDROID_APK_DIR=$(dirname $manifestFile) else targetname=`python3 $DIR/target-from-appdata.py $(find $(pwd)/src/$package -name "*.appdata.xml") | tr '\n' ';' | head -c -1` fi arguments=$(python3 ci-tooling/helpers/getsetting.py --project $package --product Applications --platform AndroidQt5.10 --key cmake-options) -PERSIST=1 build-cmake $package kde:$package -DANDROID_SDK_BUILD_TOOLS_REVISION=21.1.2 -DQTANDROID_EXPORTED_TARGET=$targetname $EXTRA $arguments $@ +GIT_EXTRA=$APP_GIT_EXTRA PERSIST=1 build-cmake $package kde:$package -DANDROID_SDK_BUILD_TOOLS_REVISION=21.1.2 -DQTANDROID_EXPORTED_TARGET=$targetname $EXTRA $arguments $@ pushd build/$package make create-apk if [ -d /output ] then cp *_build_apk/build/outputs/apk/*.apk /output fi