aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkharcheva <kharcheva@yandex-team.com>2024-10-10 23:24:20 +0300
committerkharcheva <kharcheva@yandex-team.com>2024-10-10 23:38:50 +0300
commit2693e3169db8ffa3b0bbe5ce0fcd81c89f0b055e (patch)
tree9b98cd838d1d8c0715b88b7916bedfd5926d3e2a
parent6828a4d1ef57ec587d0a001586e4d1d9eb0cf2d5 (diff)
downloadydb-2693e3169db8ffa3b0bbe5ce0fcd81c89f0b055e.tar.gz
Support Android build for YT library
commit_hash:a21164c621de657007dd5ba88024cf92cb5ba739
-rw-r--r--library/cpp/yt/malloc/malloc.cpp7
-rw-r--r--library/cpp/yt/malloc/malloc.h5
2 files changed, 11 insertions, 1 deletions
diff --git a/library/cpp/yt/malloc/malloc.cpp b/library/cpp/yt/malloc/malloc.cpp
index de45aa37fa..90da501518 100644
--- a/library/cpp/yt/malloc/malloc.cpp
+++ b/library/cpp/yt/malloc/malloc.cpp
@@ -12,7 +12,12 @@ extern "C" Y_WEAK size_t nallocx(size_t size, int /*flags*/) noexcept
return size;
}
-#ifndef _win_
+#if defined(__ANDROID__)
+extern "C" Y_WEAK size_t malloc_usable_size(const void* /*ptr*/)
+{
+ return 0;
+}
+#elif !defined(_win_)
extern "C" Y_WEAK size_t malloc_usable_size(void* /*ptr*/) noexcept
{
return 0;
diff --git a/library/cpp/yt/malloc/malloc.h b/library/cpp/yt/malloc/malloc.h
index 2b3efbfd00..8e3f03ccb4 100644
--- a/library/cpp/yt/malloc/malloc.h
+++ b/library/cpp/yt/malloc/malloc.h
@@ -1,8 +1,13 @@
#include <cstddef>
+
////////////////////////////////////////////////////////////////////////////////
+#if defined(__ANDROID__)
+extern "C" size_t malloc_usable_size(const void* ptr);
+#else
extern "C" size_t malloc_usable_size(void* ptr) noexcept;
+#endif
extern "C" size_t nallocx(size_t size, int flags) noexcept;