From 7188e6e2acdc4c581d42096cc4e5a1ea03f51cbe Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 18 Jan 2016 14:11:02 +0300 Subject: [PATCH] android: update build scripts --- platforms/android/build-tests/test_cmake_build.py | 5 +++++ platforms/android/build_sdk.py | 14 ++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/platforms/android/build-tests/test_cmake_build.py b/platforms/android/build-tests/test_cmake_build.py index 0e84928f0a..f02915c611 100644 --- a/platforms/android/build-tests/test_cmake_build.py +++ b/platforms/android/build-tests/test_cmake_build.py @@ -2,6 +2,9 @@ import unittest import os, sys, subprocess, argparse, shutil, re +import logging as log + +log.basicConfig(format='%(message)s', level=log.DEBUG) CMAKE_TEMPLATE='''\ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) @@ -83,10 +86,12 @@ class TestCmakeBuild(unittest.TestCase): "-DANDROID_TOOLCHAIN_NAME=%s" % self.toolchain, self.srcdir ] + log.info("Executing: %s" % cmd) retcode = subprocess.call(cmd) self.assertEqual(retcode, 0, "cmake failed") cmd = ["ninja"] + log.info("Executing: %s" % cmd) retcode = subprocess.call(cmd) self.assertEqual(retcode, 0, "make failed") diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py index 812b465e7b..61c9f7d34f 100755 --- a/platforms/android/build_sdk.py +++ b/platforms/android/build_sdk.py @@ -73,8 +73,7 @@ class ABI: def __str__(self): return "%s (%s)" % (self.name, self.toolchain) def haveIPP(self): - return False - # return self.name == "x86" or self.name == "x86_64" + return self.name == "x86" or self.name == "x86_64" ABIs = [ ABI("2", "armeabi-v7a", "arm-linux-androideabi-4.8", cmake_name="armeabi-v7a with NEON"), @@ -143,7 +142,7 @@ class Builder: cmd.append(self.opencvdir) if self.use_ccache == True: - cmd.extend(["-DNDK_CCACHE=ccache", "-DENABLE_PRECOMPILED_HEADERS=OFF"]) + cmd.append("-DNDK_CCACHE=ccache") if do_install: cmd.extend(["-DBUILD_TESTS=ON", "-DINSTALL_TESTS=ON"]) execute(cmd) @@ -238,15 +237,6 @@ class Builder: log.info("Copy docs: %s", self.docdest) shutil.copytree(self.docdest, os.path.join(self.resultdest, "sdk", "java", "javadoc")) - # Patch cmake config - with open(os.path.join(self.resultdest, "sdk", "native", "jni", "OpenCVConfig.cmake"), "r+t") as f: - contents = f.read() - contents, count = re.subn(r'OpenCV_ANDROID_NATIVE_API_LEVEL \d+', "OpenCV_ANDROID_NATIVE_API_LEVEL 8", contents) - f.seek(0) - f.write(contents) - f.truncate() - log.info("Patch cmake config: %s (%d changes)", f.name, count) - # Clean samples path = os.path.join(self.resultdest, "samples") for item in os.listdir(path):