diff options
| author | jandegr <jandegr@users.noreply.github.com> | 2019-08-16 20:45:07 +0200 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2019-08-16 12:45:07 -0600 |
| commit | c2f9838f07a52cc64cb05e9cf95bb378261946d9 (patch) | |
| tree | cc773d9ee43c287c953d2fd90f49f731df020059 /.circleci | |
| parent | ab4d8087a349fa580a4fca1053eca44b1813be16 (diff) | |
| download | navit-c2f9838f07a52cc64cb05e9cf95bb378261946d9.tar.gz | |
Android build fix and update (#827)
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 823ca54d0..273406c54 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -68,7 +68,7 @@ jobs: build_android: working_directory: ~/code docker: - - image: circleci/android:api-28-ndk + - image: circleci/android:api-29 environment: JVM_OPTS: -Xmx3200m GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' @@ -78,14 +78,19 @@ jobs: name: Id command: cat /etc/*release - run: - name: Install cmake gettext libsaxonb-java librsvg2-bin pkg-config libprotobuf-c-dev protobuf-c-compiler + name: Install cmake gettext libsaxonb-java librsvg2-bin pkg-config rename command: | sudo apt-get update - sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config libprotobuf-c-dev protobuf-c-compiler + sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config rename - run: name: Install Android SDK components command: sdkmanager "cmake;3.6.4111459" - 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: |