Commit 6b9b9c9e authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧

Android: Made sure that the clang-based docker builds

parent 24dabef3
......@@ -3,7 +3,7 @@ FROM ubuntu:16.04
# inspired by rabits/qt which we use for the gcc toolkit
MAINTAINER Aleix Pol <aleixpol@kde.org>
ARG QT_VERSION=5.11.0
ARG QT_VERSION=5.11.2
ARG NDK_VERSION=r16b
ARG SDK_PLATFORM=android-21
ARG SDK_BUILD_TOOLS=21.1.2
......@@ -141,7 +141,7 @@ RUN cd && mkdir androiddeployqt && cd androiddeployqt \
&& echo "cmake_minimum_required(VERSION 3.11)\n\
find_package(Qt5Core REQUIRED)\n\
add_executable(androiddeployqt main.cpp)\n\
target_link_libraries(androiddeployqt Qt5::Core)\n" > CMakeLists.txt && cmake . -DQt5Core_DIR=/opt/nativetooling/lib/cmake/Qt5Core && make && sudo cp androiddeployqt /opt/Qt/5.11.0/android_armv7/bin/androiddeployqt \
target_link_libraries(androiddeployqt Qt5::Core)\n" > CMakeLists.txt && cmake . -DQt5Core_DIR=/opt/nativetooling/lib/cmake/Qt5Core && make && sudo cp androiddeployqt /opt/Qt/${QT_VERSION}/android_armv7/bin/androiddeployqt \
&& cd && rm -rf androiddeployqt
COPY build-standalone /opt/helpers
......@@ -155,7 +155,7 @@ RUN cd && git clone https://github.com/libexpat/libexpat.git --single-branch &&
&& cd ../.. && rm -rf libexpat
#build dbus
RUN EXTRA=cmake /opt/helpers/build-cmake dbus git://anongit.freedesktop.org/git/dbus/dbus -DEXPAT_INCLUDE_DIR=/opt/kdeandroid-deps/include -DEXPAT_LIBRARY=/opt/kdeandroid-deps/lib/libexpat.so
RUN EXTRA_CMAKE_SUBDIR=cmake /opt/helpers/build-cmake dbus git://anongit.freedesktop.org/git/dbus/dbus -DEXPAT_INCLUDE_DIR=/opt/kdeandroid-deps/include -DEXPAT_LIBRARY=/opt/kdeandroid-deps/lib/libexpat.so
#build qtdbus
RUN unset ANDROID_NDK_TOOLCHAIN_VERSION \
......
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