Skip to content

GitLab

C
CI Tooling
Commit 59858bcd authored by Nicolas Fella's avatar Nicolas Fella Committed by Aleix Pol Gonzalez
Browse files
Options

[android] Fix discount helper

parent 841eaefe
Pipeline #14954 skipped with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 3 additions and 3 deletions
    system-images/android/sdk/Dockerfile-aarch64
    View file @ 59858bcd
    ......@@ -184,7 +184,7 @@ ENV QMAKESPEC android-clang
    RUN /opt/helpers/build-cmake libintl-lite https://github.com/j-jorge/libintl-lite.git
    COPY build-qt build-generic build-eigen build-poppler build-vlcqt build-gstreamer-binaries build-kde-dependencies build-kde-project create-apk get-apk-args \
    target-from-manifest.py target-from-appdata.py cp-with-prefix skip build-discount /opt/helpers/
    target-from-manifest.py target-from-appdata.py cp-with-prefix skip 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_ANDROID/src/android/templates/AndroidManifest.xml \
    && sed -i.bak 's/|density//g' $QT_ANDROID/src/android/templates/AndroidManifest.xml
    ......
    system-images/android/sdk/Dockerfile-arm
    View file @ 59858bcd
    ......@@ -184,7 +184,7 @@ ENV QMAKESPEC android-clang
    RUN /opt/helpers/build-cmake libintl-lite https://github.com/j-jorge/libintl-lite.git
    COPY build-qt build-generic build-eigen build-poppler build-vlcqt build-gstreamer-binaries build-kde-dependencies build-kde-project create-apk get-apk-args \
    target-from-manifest.py target-from-appdata.py cp-with-prefix skip build-discount /opt/helpers/
    target-from-manifest.py target-from-appdata.py cp-with-prefix skip 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_ANDROID/src/android/templates/AndroidManifest.xml \
    && sed -i.bak 's/|density//g' $QT_ANDROID/src/android/templates/AndroidManifest.xml
    ......
    system-images/android/sdk/build-discount 100644 → 100755
    View file @ 59858bcd
    ......@@ -15,7 +15,7 @@ fi
    cd discount
    # discount executes a previously build executable during build. Therefore we need to build it natively first and then use the built executable to cross-compile
    git apply 0001-Hack-Use-mktags-from-native-build-when-crosscompilin.patch
    git apply /opt/helpers/0001-Hack-Use-mktags-from-native-build-when-crosscompilin.patch
    BUILD=build-native EXTRA_CMAKE_SUBDIR=cmake /opt/helpers/build-cmake-native discount https://github.com/Orc/discount -DDISCOUNT_ONLY_LIBRARY=On -DCMAKE_INSTALL_PREFIX=/opt/nativetooling
    ......
    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