32 bit fix final

.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]

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")

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}
 )

platform/platform_android.cpp

@@ -174,8 +174,9 @@ unique_ptr<ModelReader> Platform::GetReader(string const & file, string const &
       {
         return make_unique<ZipFileReader>(m_resourcesDir, "assets/" + file, logPageSize, logPageCount);
       }
-      catch (Reader::OpenException const &)
+      catch (Reader::OpenException const & e)
       {
+          LOG(LWARNING, ("Can't get reader:", e.what()));
       }
       break;