diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 9bcc415fe1..0a733474cf 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -59,6 +59,8 @@
 #include <utility>
 #include <vector>
 
+#include <android/api-level.h>
+
 using namespace std;
 using namespace std::placeholders;
 
@@ -174,7 +176,8 @@ bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi
   // Vulkan is supported only since Android 8.0, because some Android devices with Android 7.x
   // have fatal driver issue, which can lead to process termination and whole OS destabilization.
   int constexpr kMinSdkVersionForVulkan = 26;
-  int const sdkVersion = GetAndroidSdkVersion();
+  int const sdkVersion = android_get_device_api_level();
+  LOG(LINFO, ("Android SDK version in the Drape Engine:", sdkVersion));
   auto const vulkanForbidden = sdkVersion < kMinSdkVersionForVulkan ||
                                dp::SupportManager::Instance().IsVulkanForbidden();
   if (vulkanForbidden)
diff --git a/android/jni/com/mapswithme/opengl/androidoglcontextfactory.cpp b/android/jni/com/mapswithme/opengl/androidoglcontextfactory.cpp
index 4089939de8..f71451471b 100644
--- a/android/jni/com/mapswithme/opengl/androidoglcontextfactory.cpp
+++ b/android/jni/com/mapswithme/opengl/androidoglcontextfactory.cpp
@@ -10,6 +10,7 @@
 #include <algorithm>
 
 #include <EGL/egl.h>
+#include <android/api-level.h>
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 
@@ -106,14 +107,9 @@ AndroidOGLContextFactory::AndroidOGLContextFactory(JNIEnv * env, jobject jsurfac
   }
 
   // Check ES3 availability.
-  bool availableES3 = IsSupportedRGB8(m_display, true /* es3 */);
-  if (availableES3)
-  {
-    int const sdkVersion = GetAndroidSdkVersion();
-    if (sdkVersion != 0)
-      availableES3 = (sdkVersion >= kMinSdkVersionForES3);
-  }
-  m_supportedES3 = availableES3 && gl3stubInit();
+  bool const isES3Supported = IsSupportedRGB8(m_display, true /* es3 */) &&
+             android_get_device_api_level() >= kMinSdkVersionForES3;
+  m_supportedES3 = isES3Supported && gl3stubInit();
 
   SetSurface(env, jsurface);
 
diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp
index 483a365f37..28d17923a3 100644
--- a/android/jni/com/mapswithme/platform/Platform.cpp
+++ b/android/jni/com/mapswithme/platform/Platform.cpp
@@ -16,8 +16,6 @@
 #include <memory>
 #include <utility>
 
-#include <sys/system_properties.h>
-
 std::string Platform::GetMemoryInfo() const
 {
   JNIEnv * env = jni::GetEnv();
@@ -243,19 +241,6 @@ void Platform::AndroidSecureStorage::Remove(std::string const & key)
   env->CallStaticVoidMethod(m_secureStorageClass, removeMethodId, context,
                             jni::TScopedLocalRef(env, jni::ToJavaString(env, key)).get());
 }
-
-int GetAndroidSdkVersion()
-{
-  char osVersion[PROP_VALUE_MAX + 1];
-  if (__system_property_get("ro.build.version.sdk", osVersion) == 0)
-    return 0;
-
-  int version;
-  if (!strings::to_int(std::string(osVersion), version))
-    version = 0;
-
-  return version;
-}
 }  // namespace android
 
 Platform & GetPlatform()
diff --git a/android/jni/com/mapswithme/platform/Platform.hpp b/android/jni/com/mapswithme/platform/Platform.hpp
index 9693484ca7..10e9e5e6b9 100644
--- a/android/jni/com/mapswithme/platform/Platform.hpp
+++ b/android/jni/com/mapswithme/platform/Platform.hpp
@@ -55,7 +55,4 @@ private:
   jobject m_functorProcessObject = nullptr;
   AndroidSecureStorage m_secureStorage;
 };
-
-extern int GetAndroidSdkVersion();
-
 } // namespace android