From c3ffcde70fd6b701c80d6decbefe681613a97bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=93=D1=80=D0=B5=D1=88=D0=B8=D0=BB=D0=BE=D0=B2=20=D0=92?=
 =?UTF-8?q?=D1=8F=D1=87=D0=B5=D1=81=D0=BB=D0=B0=D0=B2?=
 <v.greshilov@corp.mail.ru>
Date: Tue, 31 Oct 2017 15:44:43 +0300
Subject: [PATCH] Added .gitignore rules X32 variable deleted, set
 USE_FILE32API by default

---
 .gitignore                    |  3 ---
 3party/minizip/CMakeLists.txt |  6 +-----
 CMakeLists.txt                | 11 +----------
 android/.gitignore            |  1 +
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9cb8ea502d..16d4e8ef32 100644
--- a/.gitignore
+++ b/.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]
diff --git a/3party/minizip/CMakeLists.txt b/3party/minizip/CMakeLists.txt
index da0cb3d4cd..728f1f5a55 100644
--- a/3party/minizip/CMakeLists.txt
+++ b/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")
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4ad0b1466..9b3f0946aa 100644
--- a/CMakeLists.txt
+++ b/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"))
diff --git a/android/.gitignore b/android/.gitignore
index 690715a1be..4c225649fc 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -11,6 +11,7 @@ build
 3rd_party/api-android/
 RELEASE
 .idea
+.externalNativeBuild
 
 # For now, ignore Android Studio projects
 *.iml