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

Merge branch '4.x' into '5.x'

Browse Source
This commit is contained in:
Maksim Shabunin
2024-06-11 19:38:59 +03:00
parent a2d2ea6536 a03b813167
commit 26ea34c4cb
573 changed files with 72922 additions and 7355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/android/build_sdk.py
+8
View File
@@ -158,6 +158,7 @@ class Builder:
self.debug = True if config.debug else False
self.debug_info = True if config.debug_info else False
self.no_samples_build = True if config.no_samples_build else False
self.hwasan = True if config.hwasan else False
self.opencl = True if config.opencl else False
self.no_kotlin = True if config.no_kotlin else False
self.shared = True if config.shared else False
@@ -265,6 +266,12 @@ class Builder:
if no_media_ndk:
cmake_vars['WITH_ANDROID_MEDIANDK'] = "OFF"
if self.hwasan and "arm64" in abi.name:
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
cmake_vars.update(abi.cmake_vars)
if len(self.disable) > 0:
@@ -380,6 +387,7 @@ if __name__ == "__main__":
parser.add_argument('--no_kotlin', action="store_true", help="Disable Kotlin extensions")
parser.add_argument('--shared', action="store_true", help="Build shared libraries")
parser.add_argument('--no_media_ndk', action="store_true", help="Do not link Media NDK (required for video I/O support)")
parser.add_argument('--hwasan', action="store_true", help="Enable Hardware Address Sanitizer on ARM64")
parser.add_argument('--disable', metavar='FEATURE', default=[], action='append', help='OpenCV features to disable (add WITH_*=OFF). To disable multiple, specify this flag again, e.g. "--disable TBB --disable OPENMP"')
args = parser.parse_args()