diff options
| author | mvglasow <michael@vonglasow.com> | 2019-08-22 19:26:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-22 19:26:09 +0300 |
| commit | 5e644dad94fbbe287aece4bf04428265349eafe4 (patch) | |
| tree | 42ce9e1a56055547bccf5145da60b060ee520190 | |
| parent | fade062230b2addd5982ddf0bae463e890a82c35 (diff) | |
| parent | 09cba6747620974a29739383f56d30eb74d9be92 (diff) | |
| download | navit-5e644dad94fbbe287aece4bf04428265349eafe4.tar.gz | |
Merge pull request #839 from mvglasow/github827
Fix:toolchain:Remove privileged operation from build script
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rwxr-xr-x | 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..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. |