Merge branch 'rightlib' into mergelibs-241016-1210

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;