diff options
| author | jkoan <jkoan@users.noreply.github.com> | 2020-01-15 22:17:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 22:17:10 +0100 |
| commit | 6d2ca93c574b359abc5212c924d9191723e26331 (patch) | |
| tree | f5963f626db126cd628672fc213e67991751a49f | |
| parent | 7e2d98408e353499a4103233646eb68fe2885d7c (diff) | |
| parent | efd08abf41b4a702e929906e0636c7fe02646175 (diff) | |
| download | navit-android_hole.tar.gz | |
Merge branch 'trunk' into android_holeandroid_hole
| -rw-r--r-- | .circleci/config.yml | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index d936b010b..2ae41da7c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,7 +78,7 @@ jobs: build_android: working_directory: ~/code docker: - - image: circleci/android:api-29 + - image: circleci/android:api-29-ndk environment: JVM_OPTS: -Xmx3200m GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' @@ -86,19 +86,11 @@ jobs: - checkout - run: if scripts/check_need_build.sh; then circleci step halt; fi - run: - name: Id - command: cat /etc/*release - - run: name: Install ant cmake gettext libsaxonb-java librsvg2-bin pkg-config rename command: | sudo apt-get update sudo apt-get install -y ant cmake gettext libsaxonb-java librsvg2-bin pkg-config rename - run: - name: Install ndk - command: | - echo y | sdkmanager --licenses - echo y | sdkmanager ndk-bundle - - run: name: Build for Android command: bash scripts/build_android.sh - run: |