diff options
| author | jkoan <jkoan@users.noreply.github.com> | 2020-01-18 18:41:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-18 18:41:57 +0100 |
| commit | 3882bc6e6af57b89e4783cc8a7e08a0539d0ece8 (patch) | |
| tree | 77f69a434449c358cea44810f800a004e8227f00 | |
| parent | 55c1900326506f948f85416518e273906b6fe391 (diff) | |
| download | navit-3882bc6e6af57b89e4783cc8a7e08a0539d0ece8.tar.gz | |
change:build_android:Remove dependency of ant. Not needed anymore (#956)
Co-authored-by: Joseph Herlant <aerostitch@users.noreply.github.com>
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rwxr-xr-x | CMakeLists.txt | 9 | ||||
| -rwxr-xr-x | scripts/build_android.sh | 2 |
3 files changed, 2 insertions, 13 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ae41da7c..d3a279229 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,10 +86,10 @@ jobs: - checkout - run: if scripts/check_need_build.sh; then circleci step halt; fi - run: - name: Install ant cmake gettext libsaxonb-java librsvg2-bin pkg-config rename + name: Install cmake gettext libsaxonb-java librsvg2-bin pkg-config rename command: | sudo apt-get update - sudo apt-get install -y ant cmake gettext libsaxonb-java librsvg2-bin pkg-config rename + sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config rename - run: name: Build for Android command: bash scripts/build_android.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d001b99b..a68c89747 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -725,15 +725,6 @@ if(ANDROID) message(STATUS "Using generator " ${CMAKE_GENERATOR}) if (NOT ${CMAKE_GENERATOR} STREQUAL Ninja) find_program(ANDROID_LOCATION NAMES android android.bat) - find_program(ANT_LOCATION NAMES ant) - if (NOT ANT_LOCATION) - message_error("Could not find ant. Please install ant and add it to the search path.") - else() - execute_process(COMMAND ${ANT_LOCATION} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake RESULT_VARIABLE ANT_VERSION_OK OUTPUT_QUIET ERROR_QUIET) - if(ANT_VERSION_OK GREATER 0) - message(WARNING "Old ant version detected. If you need crash reporter, update to at least ant 1.8") - endif() - endif() if (NOT ANDROID_LOCATION) message_error( "Could not find 'Android SDK and AVD Manager'. Please install the android sdk and add the <android-sdk>/tools directory to the search path.") endif() diff --git a/scripts/build_android.sh b/scripts/build_android.sh index 00ad18367..6512dab1f 100755 --- a/scripts/build_android.sh +++ b/scripts/build_android.sh @@ -25,8 +25,6 @@ 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." >&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. # Note: If you want to compile against specific target libraries that are searched using pkgconfig, please run this script with variable PKG_CONFIG_LIBDIR set to the appropriate path |