diff --git a/packages/platforms/android/cpp-profiler/CMakeLists.txt b/packages/platforms/android/cpp-profiler/CMakeLists.txt index f8fbdfc6..17da09d1 100644 --- a/packages/platforms/android/cpp-profiler/CMakeLists.txt +++ b/packages/platforms/android/cpp-profiler/CMakeLists.txt @@ -4,3 +4,7 @@ project(android-cmake-flashlight) set(CMAKE_CXX_STANDARD 17) add_executable(BAMPerfProfiler src/main.cpp src/atrace.cpp src/utils.cpp) + +# Android 15+ devices can use 16 KB memory pages; a binary whose LOAD segments are only 4 KB-aligned +# segfaults there. NDK r28+ does this by default, this keeps older NDKs working too. +target_link_options(BAMPerfProfiler PRIVATE -Wl,-z,max-page-size=16384) diff --git a/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-arm64-v8a b/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-arm64-v8a index f4f6b7be..85a597ab 100755 Binary files a/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-arm64-v8a and b/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-arm64-v8a differ diff --git a/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-armeabi-v7a b/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-armeabi-v7a index b645fe27..9daa9c6a 100755 Binary files a/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-armeabi-v7a and b/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-armeabi-v7a differ diff --git a/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-x86 b/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-x86 index 35723981..39c7c7f5 100755 Binary files a/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-x86 and b/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-x86 differ diff --git a/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-x86_64 b/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-x86_64 index f4f35c13..adf81a1c 100755 Binary files a/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-x86_64 and b/packages/platforms/android/cpp-profiler/bin/BAMPerfProfiler-x86_64 differ