Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added --extra_modules_path to build_sdk.py #6460

Merged
merged 1 commit into from May 13, 2016
Merged

Added --extra_modules_path to build_sdk.py #6460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions platforms/android/build_sdk.py
View file
Open in desktop
Expand Up @@ -92,6 +92,7 @@ class Builder:
def __init__(self, workdir, opencvdir):
self.workdir = check_dir(workdir, create=True)
self.opencvdir = check_dir(opencvdir)
self.extra_modules_path = None
self.libdest = check_dir(os.path.join(self.workdir, "o4a"), create=True, clean=True)
self.docdest = check_dir(os.path.join(self.workdir, "javadoc"), create=True, clean=True)
self.resultdest = check_dir(os.path.join(self.workdir, "OpenCV-android-sdk"), create=True, clean=True)
Expand Down Expand Up @@ -133,9 +134,14 @@ def build_library(self, abi, do_install):
"-DANDROID_NATIVE_API_LEVEL=8",
"-DANDROID_ABI='%s'" % abi.cmake_name,
"-DWITH_TBB=ON",
"-DANDROID_TOOLCHAIN_NAME=%s" % abi.toolchain,
self.opencvdir
"-DANDROID_TOOLCHAIN_NAME=%s" % abi.toolchain
]

if self.extra_modules_path is not None:
cmd.append("-DOPENCV_EXTRA_MODULES_PATH='%s'" % self.extra_modules_path)

cmd.append(self.opencvdir)

if self.use_ccache == True:
cmd.extend(["-DNDK_CCACHE=ccache", "-DENABLE_PRECOMPILED_HEADERS=OFF"])
if do_install:
Expand Down Expand Up @@ -258,6 +264,7 @@ def gather_results(self, engines):
parser.add_argument("opencv_dir", help="Path to OpenCV source dir")
parser.add_argument('--ndk_path', help="Path to Android NDK to use for build")
parser.add_argument('--sdk_path', help="Path to Android SDK to use for build")
parser.add_argument("--extra_modules_path", help="Path to extra modules to use for build")
parser.add_argument('--sign_with', help="Sertificate to sign the Manager apk")
parser.add_argument('--build_doc', action="store_true", help="Build javadoc")
parser.add_argument('--no_ccache', action="store_true", help="Do not use ccache during library build")
Expand All @@ -277,6 +284,9 @@ def gather_results(self, engines):

builder = Builder(args.work_dir, args.opencv_dir)

if args.extra_modules_path is not None:
builder.extra_modules_path = os.path.abspath(args.extra_modules_path)

if args.no_ccache:
builder.use_ccache = False

Expand Down