From 3cebbfe35a25b23f17bf51d05298b781d5e91ada Mon Sep 17 00:00:00 2001 From: mvglasow Date: Wed, 21 Aug 2019 23:25:22 +0300 Subject: Fix:graphics/android:Remove faulty debug statement causing crashes Signed-off-by: mvglasow --- navit/graphics/android/graphics_android.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } -- cgit v1.2.1 From 82a5810b33da43f0bd5ef27493feb4682f9910f5 Mon Sep 17 00:00:00 2001 From: mvglasow Date: Wed, 21 Aug 2019 23:35:12 +0300 Subject: Fix:toolchain:Remove privileged operation from build script Signed-off-by: mvglasow --- .circleci/config.yml | 4 ++-- scripts/build_android.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 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/scripts/build_android.sh b/scripts/build_android.sh index f30c7d76c..790d8130c 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."; 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. -- cgit v1.2.1 From 09cba6747620974a29739383f56d30eb74d9be92 Mon Sep 17 00:00:00 2001 From: mvglasow Date: Thu, 22 Aug 2019 17:38:24 +0300 Subject: Add:build:Print error messages to stderr Signed-off-by: mvglasow --- scripts/build_android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_android.sh b/scripts/build_android.sh index 790d8130c..00ad18367 100755 --- a/scripts/build_android.sh +++ b/scripts/build_android.sh @@ -25,7 +25,7 @@ export GRADLE_OPTS='-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryEr # processing xml is messed up a bit after the original introduction of gradle # so require a useless install of ant here even if using gradle/ninja -which ant > /dev/null || { echo "FATAL: ant is not installed; install manually and retry."; exit 1; } +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. -- cgit v1.2.1