Merge pull request #839 from mvglasow/github827

Fix:toolchain:Remove privileged operation from build script
navit-gps · Aug 22, 2019 · 5e644da · 5e644da
2 parents fade062 + 09cba67
commit 5e644da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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.