From c00ce91a2a77c756c5cc6256246446777b7726cb Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Mon, 3 Feb 2020 22:10:47 +0100 Subject: [PATCH] Use System_GetPropertyInt(SYSPROP_SYSTEMVERSION to retrieve version. --- Common/MemArenaAndroid.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Common/MemArenaAndroid.cpp b/Common/MemArenaAndroid.cpp index 4a9242b2df..1a533b080c 100644 --- a/Common/MemArenaAndroid.cpp +++ b/Common/MemArenaAndroid.cpp @@ -20,6 +20,7 @@ #ifdef __ANDROID__ #include "base/logging.h" +#include "base/NativeApp.h" #include "MemoryUtil.h" #include "MemArena.h" #include "StringUtils.h" @@ -41,14 +42,6 @@ bool MemArena::NeedsProbing() { return false; } -static int get_sdk_version() { - char sdk[PROP_VALUE_MAX] = {0}; - if (__system_property_get("ro.build.version.sdk", sdk) != 0) { - return atoi(sdk); - } - return -1; -} - // ashmem_create_region - creates a new ashmem region and returns the file // descriptor, or <0 on error // This function is defined in much later version of the ndk, so we can only access it via dlopen(). @@ -111,7 +104,7 @@ void MemArena::GrabLowMemSpace(size_t size) { const char* name = "PPSSPP_RAM"; // Since version 26 Android provides a new api for accessing SharedMemory. - if (get_sdk_version() >= 26) { + if (System_GetPropertyInt(SYSPROP_SYSTEMVERSION) >= 26) { fd = ashmem_create_region(name, size); } else { fd = legacy_ashmem_create_region(name, size);