diff options
| -rw-r--r-- | .circleci/config.yml | 1 | ||||
| -rwxr-xr-x | CMakeLists.txt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 8fb38998c..a30fcb5ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,6 +56,7 @@ jobs: environment: JVM_OPTS: -Xmx3200m GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' + ANDROID_NDK_HOME: '/opt/android/ndk/android-ndk-r17b/' steps: - checkout - run: diff --git a/CMakeLists.txt b/CMakeLists.txt index 3eec2ffc6..58860bedf 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -711,7 +711,9 @@ if(ANDROID) set_with_reason(traffic/traff_android "Android detected" TRUE) set_with_reason(vehicle/android "Android detected" TRUE) set_with_reason(vehicle/file "Android detected" FALSE) + set_with_reason(vehicle/gpsd "Android detected" FALSE) set_with_reason(map/filter "Android detected" FALSE) + set_with_reason(map/garmin "Android detected" FALSE) set_with_reason(USE_NATIVE_LANGUAGE_SUPPORT "Android detected" TRUE) # set_with_reason(plugin/pedestrian "Android detected" TRUE) set_with_reason(support/libpng "Android detected" FALSE) |