potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2024-07-01 15:15:08 +03:00
parent 12b8ed1443 39a7b3d186
commit 3abd9f2a28
62 changed files with 2178 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/android/build_sdk.py
+7 -3
View File
@@ -267,10 +267,14 @@ class Builder:
cmake_vars['WITH_ANDROID_MEDIANDK'] = "OFF"
if self.hwasan and "arm64" in abi.name:
cmake_vars['OPENCV_ENABLE_MEMORY_SANITIZER'] = "ON"
hwasan_flags = "-fno-omit-frame-pointer -fsanitize=hwaddress"
cmake_vars['CMAKE_CXX_FLAGS_DEBUG'] = hwasan_flags
cmake_vars['CMAKE_C_FLAGS_DEBUG'] = hwasan_flags
cmake_vars['CMAKE_LINKER_FLAGS_DEBUG'] = hwasan_flags
for s in ['OPENCV_EXTRA_C_FLAGS', 'OPENCV_EXTRA_CXX_FLAGS', 'OPENCV_EXTRA_EXE_LINKER_FLAGS',
'OPENCV_EXTRA_SHARED_LINKER_FLAGS', 'OPENCV_EXTRA_MODULE_LINKER_FLAGS']:
if s in cmake_vars.keys():
cmake_vars[s] = cmake_vars[s] + ' ' + hwasan_flags
else:
cmake_vars[s] = hwasan_flags
cmake_vars.update(abi.cmake_vars)