diff --git a/.circleci/config.yml b/.circleci/config.yml index 68664867f..34385a079 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,6 +40,16 @@ jobs: - run: /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON - run: cmake --build build -j 2 - store_artifacts: {path: ./build/devilutionx.nro, destination: devilutionx.nro} + android: + docker: + - image: circleci/android:api-28-ndk + working_directory: ~/repo + steps: + - checkout + - run: sudo apt update -y + - run: sudo apt install -y g++ cmake ninja-build + - run: cd android-project && ./gradlew assembleDebug + - store_artifacts: {path: ./android-project/app/build/outputs/apk/debug/app-debug.apk, destination: devilutionx-debug.apk} 3ds: docker: - image: devkitpro/devkitarm:latest @@ -85,6 +95,7 @@ workflows: - linux_x86_64 - linux_x86_64_test - switch + - android - 3ds - amigaos-m68k - vita diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle index 60e09dc7b..739a10367 100644 --- a/android-project/app/build.gradle +++ b/android-project/app/build.gradle @@ -38,7 +38,7 @@ android { externalNativeBuild { cmake { path '../../CMakeLists.txt' - version "3.18.1" + version "3.13.0+" } }