Commit 64b0cc9a authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧

android: make it possible to specify dependencies for projects

Summary:
This way we'll be able to build projects even if they need some random
library somewhere.

Test Plan: Built Itinerary without doing the prison hack

Reviewers: bcooksley

Reviewed By: bcooksley

Differential Revision: https://phabricator.kde.org/D16436
parent 2837ed73
kf5-qt5:
"externalDependencies": "/opt/helpers/build-cmake libqrencode https://github.com/fukuchi/libqrencode.git -DWITH_TOOLS=OFF"
......@@ -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 <sys/xattr.h> which can't be found ATM
......
......@@ -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 @@ do
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 @@ then
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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment