Merge branch 'CHT-1560-Build-Android-targets-with-more-cores' into 'develop'

Xavier Rins Lozano · Xavier Rins Lozano · commit 9fc8ec3f65e3 · 2026-01-21T19:00:51.000+01:00
CHT-1560. Build Android targets with more cores

Closes CHT-1560

See merge request megachat/MEGAchat!2156
diff --git a/dockerfile/android-cross-build.dockerfile b/dockerfile/android-cross-build.dockerfile
@@ -73,6 +73,8 @@ ENV PATH=$PATH:$JAVA_HOME
 
 # Set default architecture
 ARG ARCH=x64
+ARG BUILD_CORES=4
+ENV BUILD_CORES=${BUILD_CORES}
 
 # Install AWS cli to use VCPKG cache in S4
 RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
@@ -100,12 +102,13 @@ CMD ["sh", "-c", "\
       *) \
         echo 'Unsupported architecture: ${ARCH}' && exit 1;; \
     esac && \
-    su - me -w 'ANDROID_NDK_HOME,PATH,JAVA_HOME,ANDROID_ARCH,AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY,AWS_ENDPOINT_URL,VCPKG_BINARY_SOURCES' -c ' \
+    su - me -w 'ANDROID_NDK_HOME,PATH,JAVA_HOME,ANDROID_ARCH,AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY,AWS_ENDPOINT_URL,VCPKG_BINARY_SOURCES,BUILD_CORES' -c ' \
     cmake \
         --preset mega-android \
         -S MEGAchat \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DANDROID_ABI=${ANDROID_ARCH} && \
     cmake \
-        --build build-MEGAchat-mega-android' && \
+        --build build-MEGAchat-mega-android \
+        -j ${BUILD_CORES}' && \
     exec /bin/bash"]
diff --git a/jenkinsfile/specific_branches/MEGAchat-all-android-targets.groovy b/jenkinsfile/specific_branches/MEGAchat-all-android-targets.groovy
@@ -221,6 +221,7 @@ pipeline {
                                 -e AWS_SECRET_ACCESS_KEY \
                                 -e AWS_ENDPOINT_URL \
                                 -e ARCH=arm \
+                                -e BUILD_CORES=4 \
                                 meganz/megachat-android-build-env:${env.BUILD_NUMBER}
                         """
                     }
@@ -254,6 +255,7 @@ pipeline {
                                 -v ${VCPKGPATH}:/mega/vcpkg \
                                 -v ${WORKSPACE}/output/android-dynamic/arm64:/mega/build-MEGAchat-mega-android \
                                 -e ARCH=arm64 \
+                                -e BUILD_CORES=4 \
                                 -e VCPKG_BINARY_SOURCES \
                                 -e AWS_ACCESS_KEY_ID \
                                 -e AWS_SECRET_ACCESS_KEY \
@@ -292,6 +294,7 @@ pipeline {
                                 -v ${VCPKGPATH}:/mega/vcpkg \
                                 -v ${WORKSPACE}/output/android-dynamic/x86:/mega/build-MEGAchat-mega-android \
                                 -e ARCH=x86 \
+                                -e BUILD_CORES=4 \
                                 -e VCPKG_BINARY_SOURCES \
                                 -e AWS_ACCESS_KEY_ID \
                                 -e AWS_SECRET_ACCESS_KEY \
@@ -330,6 +333,7 @@ pipeline {
                                 -v ${VCPKGPATH}:/mega/vcpkg \
                                 -v ${WORKSPACE}/output/android-dynamic/x64:/mega/build-MEGAchat-mega-android \
                                 -e ARCH=x64 \
+                                -e BUILD_CORES=4 \
                                 -e VCPKG_BINARY_SOURCES \
                                 -e AWS_ACCESS_KEY_ID \
                                 -e AWS_SECRET_ACCESS_KEY \
