mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11391 from alalek:android_pack_fix_contrib

Browse Source
This commit is contained in:
Alexander Alekhin 2018-04-25 19:42:13 +00:00
commit 637d6b4e36
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platforms/android/build_sdk.py
View File

@ -317,6 +317,12 @@ if __name__ == "__main__":
if os.path.realpath(args.work_dir) == os.path.realpath(args.opencv_dir): if os.path.realpath(args.work_dir) == os.path.realpath(args.opencv_dir):
raise Fail("Specify workdir (building from OpenCV source directory is not supported)") raise Fail("Specify workdir (building from OpenCV source directory is not supported)")
# Relative paths become invalid in sub-directories
if args.opencv_dir is not None and not os.path.isabs(args.opencv_dir):
args.opencv_dir = os.path.abspath(args.opencv_dir)
if args.extra_modules_path is not None and not os.path.isabs(args.extra_modules_path):
args.extra_modules_path = os.path.abspath(args.extra_modules_path)
cpath = args.config cpath = args.config
if not os.path.exists(cpath): if not os.path.exists(cpath):
cpath = os.path.join(SCRIPT_DIR, cpath) cpath = os.path.join(SCRIPT_DIR, cpath)