summaryrefslogtreecommitdiff
path: root/.circleci
diff options
context:
space:
mode:
authormvglasow <michael -at- vonglasow.com>2019-01-26 18:45:37 +0100
committermvglasow <michael -at- vonglasow.com>2019-01-26 18:45:37 +0100
commitb3458fc81feceecda4fba6a42cec3889386fd3d3 (patch)
tree2108d88f4128085eb35a4462b1a1ab6e5489f4d6 /.circleci
parentb9d57c3f45f36aaee7520c5b1b889c08879d51b9 (diff)
parent291af09e114683b1c6852c99e86833614a84ddbe (diff)
downloadnavit-b3458fc81feceecda4fba6a42cec3889386fd3d3.tar.gz
Merge branch 'master' into build_android2
Diffstat (limited to '.circleci')
-rw-r--r--.circleci/config.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index bf7bff9af..68ffad440 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,7 +68,7 @@ jobs:
build_android_arm:
working_directory: ~/code
docker:
- - image: circleci/android:api-27-alpha
+ - image: circleci/android:api-28-ndk
environment:
JVM_OPTS: -Xmx3200m
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'