diff --git a/.gitignore b/.gitignore index 16d4e8ef32..9cb8ea502d 100644 --- a/.gitignore +++ b/.gitignore @@ -87,6 +87,9 @@ version/version.hpp tools/win/MapsWithMe* GeneratedFiles +# Android CMake +android/.externalNativeBuild + # data data/intermediate_data data/[0-9][0-9][0-9][0-9][0-9][0-9] diff --git a/3party/minizip/CMakeLists.txt b/3party/minizip/CMakeLists.txt index 1b8492e079..da0cb3d4cd 100644 --- a/3party/minizip/CMakeLists.txt +++ b/3party/minizip/CMakeLists.txt @@ -1,9 +1,9 @@ project(minizip) -add_definitions(-DUSE_FILE32API -DNOCRYPT) +add_definitions(-DNOCRYPT) if (ANDROID_DETECTED AND X32) - add_definitions(-DIOAPI_NO_64) + add_definitions(-DUSE_FILE32API) endif() add_clang_compile_options("-Wno-unused-value") diff --git a/generator/generator_tests/CMakeLists.txt b/generator/generator_tests/CMakeLists.txt index 10c85f75b8..332be172fa 100644 --- a/generator/generator_tests/CMakeLists.txt +++ b/generator/generator_tests/CMakeLists.txt @@ -1,7 +1,5 @@ project(generator_tests) -find_package(sqlite3) - set( SRC altitude_test.cpp @@ -67,6 +65,7 @@ omim_link_libraries( opening_hours stb_image sdf_image + # TODO(syershov): Use FindPackage. sqlite3 ${LIBZ} ) diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp index 327e8fc871..f1d9814f9b 100644 --- a/platform/platform_android.cpp +++ b/platform/platform_android.cpp @@ -174,8 +174,9 @@ unique_ptr Platform::GetReader(string const & file, string const & { return make_unique(m_resourcesDir, "assets/" + file, logPageSize, logPageCount); } - catch (Reader::OpenException const &) + catch (Reader::OpenException const & e) { + LOG(LWARNING, ("Can't get reader:", e.what())); } break;