Commit 1b853182 authored by Nicolas Fella's avatar Nicolas Fella Committed by Aleix Pol Gonzalez

[android] Use new ECM feature to output APKs

parent 1d5ed89b
Pipeline #25367 skipped with stage
......@@ -81,6 +81,9 @@ RUN chmod a+w /opt/
# Add group & user
RUN groupadd -r user && useradd --create-home --gid user user && echo 'user ALL=NOPASSWD: ALL' > /etc/sudoers.d/user
RUN mkdir /output
RUN chown user:user /output
USER user
WORKDIR /home/user
ENV HOME /home/user
......@@ -164,7 +167,7 @@ ENV QMAKESPEC android-clang
RUN /opt/helpers/build-cmake libintl-lite https://github.com/j-jorge/libintl-lite.git
COPY build-autotools build-qt build-generic build-eigen build-poppler build-vlcqt build-gstreamer-binaries build-kde-dependencies build-kde-project create-apk get-apk-args.py \
cp-with-prefix skip build-standalone build-discount 0001-Hack-Use-mktags-from-native-build-when-crosscompilin.patch /opt/helpers/
skip build-standalone build-discount 0001-Hack-Use-mktags-from-native-build-when-crosscompilin.patch /opt/helpers/
RUN sed -i.bak 's/android:minSdkVersion="16"/android:minSdkVersion="21"/g' $QT_PATH/src/android/templates/AndroidManifest.xml \
&& sed -i.bak 's/|density//g' $QT_PATH/src/android/templates/AndroidManifest.xml
......
......@@ -19,5 +19,5 @@ git clone --depth 1 kde:$package $APP_GIT_EXTRA || true
popd
APK_ARGS=`python3 $DIR/get-apk-args.py $(pwd)/src/$package`
build-kde-project $package Applications $APK_ARGS $@
build-kde-project $package Applications $APK_ARGS -DANDROID_APK_OUTPUT_DIR=/output $@
create-apk $package
#!/bin/bash
set -e
prefix=$1
shift
dest="${@: -1}"
array="${@:1:${#}-1}"
for v in $array;
do
filename=$(basename $v)
cp $v $dest/$prefix-$filename
done
......@@ -22,10 +22,6 @@ function create_apk
make create-apk
fi
if [ -d /output ]
then
find *_build_apk/build/outputs/apk/ -name \*.apk -exec cp-with-prefix "$1" {} /output/ \;
fi
popd
}
......
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