diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2019-08-22 19:48:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-22 19:48:09 +0200 |
| commit | aaab89b80cb9f11f1a36d610523d183d5d62a9be (patch) | |
| tree | b375fbca7adef7366c97661258349fcb1a4bb6f0 | |
| parent | b2991104c538c532b905bd96beb060f989bfbc96 (diff) | |
| parent | 5e644dad94fbbe287aece4bf04428265349eafe4 (diff) | |
| download | navit-aaab89b80cb9f11f1a36d610523d183d5d62a9be.tar.gz | |
Merge branch 'trunk' into multipolygon
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | navit/graphics/android/graphics_android.c | 2 | ||||
| -rwxr-xr-x | scripts/build_android.sh | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 273406c54..9aabd4072 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,10 +78,10 @@ jobs: name: Id command: cat /etc/*release - run: - name: Install cmake gettext libsaxonb-java librsvg2-bin pkg-config rename + name: Install ant 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 rename + sudo apt-get install -y ant cmake gettext libsaxonb-java librsvg2-bin pkg-config rename - run: name: Install Android SDK components command: sdkmanager "cmake;3.6.4111459" diff --git a/navit/graphics/android/graphics_android.c b/navit/graphics/android/graphics_android.c index 68cf1874d..e119cf3cc 100644 --- a/navit/graphics/android/graphics_android.c +++ b/navit/graphics/android/graphics_android.c @@ -479,7 +479,7 @@ static struct graphics_methods graphics_methods = { static void resize_callback(struct graphics_priv *gra, int w, int h) { dbg(lvl_debug,"w=%d h=%d ok",w,h); - dbg(lvl_debug,"gra=%p, %d callbacks in list", gra, g_list_length(gra->cbl)); + dbg(lvl_debug,"gra=%p, gra->cbl=%p", gra, gra->cbl); callback_list_call_attr_2(gra->cbl, attr_resize, (void *)w, (void *)h); } diff --git a/scripts/build_android.sh b/scripts/build_android.sh index f30c7d76c..00ad18367 100755 --- a/scripts/build_android.sh +++ b/scripts/build_android.sh @@ -23,9 +23,9 @@ export JVM_OPTS="-Xmx3200m" export GRADLE_OPTS='-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' # processing xml is messed up a bit after the original introduction of gradle -# so a useless install of ant here even if using gradle/ninja +# so require a useless install of ant here even if using gradle/ninja -sudo apt-get install -y ant +which ant > /dev/null || { echo "FATAL: ant is not installed; install manually and retry." >&2; exit 1; } echo Run CMake test -z "$PKG_CONFIG_LIBDIR" && export PKG_CONFIG_LIBDIR="" # Force cmake below to run ignore build host libraries when using pkgconfig. |