Added .gitignore rules

X32 variable deleted, set USE_FILE32API by default

.gitignore

@@ -87,9 +87,6 @@ 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,10 +1,6 @@
 project(minizip)
 
-add_definitions(-DNOCRYPT)
-
-if (ANDROID_DETECTED AND X32)
-  add_definitions(-DUSE_FILE32API)
-endif()
+add_definitions(-DUSE_FILE32API -DNOCRYPT)
 
 add_clang_compile_options("-Wno-unused-value")
 

CMakeLists.txt

@@ -33,21 +33,12 @@ function(omim_set_platform_var PLATFORM_VAR pattern)
   endif()
 endfunction()
 
-function(omim_set_up_android ABI_VAR OS_VAR)
-  set(ANDROID_DETECTED TRUE PARENT_SCOPE)
-  if ("${ABI_VAR}" MATCHES "^(armeabi-v7a|x86)$")
-    set(X32 TRUE PARENT_SCOPE)
-  else()
-    set(X32 FALSE PARENT_SCOPE)
-  endif()
-endfunction()
-
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
   set(LINUX_DETECTED TRUE)
 endif()
 
 if (CMAKE_SYSTEM_NAME MATCHES "Android")
-  omim_set_up_android(${ANDROID_ABI} ${OS})
+  set(ANDROID_DETECTED TRUE)
 endif()
 
 if (ANDROID_DETECTED AND (${OS} MATCHES "mac"))

android/.gitignore

@@ -11,6 +11,7 @@ build
 3rd_party/api-android/
 RELEASE
 .idea
+.externalNativeBuild
 
 # For now, ignore Android Studio projects
 *.iml