diff --git a/build-specs/Frameworks/prison-AndroidQt5.11.yaml b/build-specs/Frameworks/prison-AndroidQt5.11.yaml new file mode 100644 --- /dev/null +++ b/build-specs/Frameworks/prison-AndroidQt5.11.yaml @@ -0,0 +1,2 @@ +kf5-qt5: + "externalDependencies": "/opt/helpers/build-cmake libqrencode https://github.com/fukuchi/libqrencode.git -DWITH_TOOLS=OFF" diff --git a/local-metadata/project-ignore-rules.yaml b/local-metadata/project-ignore-rules.yaml --- a/local-metadata/project-ignore-rules.yaml +++ b/local-metadata/project-ignore-rules.yaml @@ -58,7 +58,6 @@ - 'frameworks/kdewebkit' # we don't have QtWebKitWidgets on the image # to look into: -- 'frameworks/prison' # Needs qrencode and dmtx - 'kde/kdegames/libkdegames' # needs openal - 'kde/kdegraphics/libs/libkexiv2' #has exiv2 external dependency - 'frameworks/kfilemetadata' # FIXME needs #include which can't be found ATM diff --git a/system-images/android/sdk/build-generic b/system-images/android/sdk/build-generic --- a/system-images/android/sdk/build-generic +++ b/system-images/android/sdk/build-generic @@ -2,6 +2,17 @@ set -e # trap 'err_report echo "error: ${BASH_SOURCE}":"${LINENO}"' exit 1 +function buildExternalDependencies +{ + deps=$(python3 ci-tooling/helpers/getsetting.py --project $1 --product $2 --platform AndroidQt5.11 --key externalDependencies) + if [[ "$deps" ]]; then + echo "running: $deps" + $deps + else + echo "No dependencies" + fi +} + package=$1 shift @@ -36,6 +47,8 @@ continue fi + buildExternalDependencies $a Frameworks + arguments=$(python3 ci-tooling/helpers/getsetting.py --project $a --product Frameworks --platform AndroidQt5.11 --key cmake-options) build-cmake $a kde:$a $arguments -DBUILD_TESTING=OFF -GNinja $EXTRA done @@ -64,8 +77,10 @@ fi targetname=`python3 $DIR/target-from-appdata.py $appdataFile | tr '\n' ';' | head -c -1` fi -arguments=$(python3 ci-tooling/helpers/getsetting.py --project $package --product Applications --platform AndroidQt5.11 --key cmake-options) +buildExternalDependencies $package Applications + +arguments=$(python3 ci-tooling/helpers/getsetting.py --project $package --product Applications --platform AndroidQt5.11 --key cmake-options) build-cmake $package kde:$package -DQTANDROID_EXPORTED_TARGET=$targetname $EXTRA $arguments $@ pushd build/$package