generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5478 from alalek:fix_android_pack_build

Browse Source
This commit is contained in:
Alexander Alekhin 2015-10-14 13:05:18 +00:00
commit 37ce3b8cfe
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/java/CMakeLists.txt
View File

@ -7,6 +7,13 @@ if(IOS OR WINRT OR NOT PYTHON_DEFAULT_AVAILABLE OR NOT ANT_EXECUTABLE OR NOT (JN
ocv_module_disable(java) ocv_module_disable(java)
endif() endif()
if(EXISTS ${CMAKE_BINARY_DIR}/src)
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_BINARY_DIR}/src")
endif()
if(EXISTS ${CMAKE_BINARY_DIR}/gen)
execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_BINARY_DIR}/gen")
endif()
set(the_description "The java bindings") set(the_description "The java bindings")
ocv_add_module(java BINDINGS opencv_core opencv_imgproc) ocv_add_module(java BINDINGS opencv_core opencv_imgproc)
ocv_module_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/generator/src/cpp") ocv_module_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/generator/src/cpp")

2
modules/java/android_lib/AndroidManifest.xml
View File

@ -4,5 +4,5 @@
android:versionCode="@OPENCV_VERSION_MAJOR@@OPENCV_VERSION_MINOR@@OPENCV_VERSION_PATCH@0" android:versionCode="@OPENCV_VERSION_MAJOR@@OPENCV_VERSION_MINOR@@OPENCV_VERSION_PATCH@0"
android:versionName="@OPENCV_VERSION@"> android:versionName="@OPENCV_VERSION@">
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="21" />
</manifest> </manifest>

8
platforms/android/build-tests/test_ant_build.py
View File

@ -17,7 +17,7 @@ class TestAntBuild(unittest.TestCase):
self.sample_dir = os.path.join(self.workdir, "project") self.sample_dir = os.path.join(self.workdir, "project")
def shortDescription(self): def shortDescription(self):
return "TARGET: %s, SAMPLE: %s" % (self.target, os.path.basename(self.src_sample_dir)) return "TARGET: %r, SAMPLE: %s" % (self.target, os.path.basename(self.src_sample_dir))
def setUp(self): def setUp(self):
if os.path.exists(self.workdir): if os.path.exists(self.workdir):
@ -32,7 +32,7 @@ class TestAntBuild(unittest.TestCase):
shutil.rmtree(self.workdir) shutil.rmtree(self.workdir)
def runTest(self): def runTest(self):
cmd = [os.path.join(os.environ["ANDROID_SDK"], "tools", "android"), "update", "project", "-p", self.lib_dir, "-t", self.target] cmd = [os.path.join(os.environ["ANDROID_SDK"], "tools", "android"), "update", "project", "-p", self.lib_dir, "-t", self.target[0]]
retcode = subprocess.call(cmd) retcode = subprocess.call(cmd)
self.assertEqual(retcode, 0, "android update opencv project failed") self.assertEqual(retcode, 0, "android update opencv project failed")
@ -40,7 +40,7 @@ class TestAntBuild(unittest.TestCase):
retcode = subprocess.call(cmd) retcode = subprocess.call(cmd)
self.assertEqual(retcode, 0, "opencv ant build failed") self.assertEqual(retcode, 0, "opencv ant build failed")
cmd = [os.path.join(os.environ["ANDROID_SDK"], "tools", "android"), "update", "project", "-p", self.sample_dir, "-t", self.target, "-l", os.path.relpath(self.lib_dir, self.sample_dir)] cmd = [os.path.join(os.environ["ANDROID_SDK"], "tools", "android"), "update", "project", "-p", self.sample_dir, "-t", self.target[1], "-l", os.path.relpath(self.lib_dir, self.sample_dir)]
retcode = subprocess.call(cmd) retcode = subprocess.call(cmd)
self.assertEqual(retcode, 0, "android update sample project failed") self.assertEqual(retcode, 0, "android update sample project failed")
@ -50,7 +50,7 @@ class TestAntBuild(unittest.TestCase):
def suite(workdir, opencv_lib_path, opencv_samples_path): def suite(workdir, opencv_lib_path, opencv_samples_path):
suite = unittest.TestSuite() suite = unittest.TestSuite()
for target in ["android-14", "android-17"]: for target in [("android-21", "android-14"), ("android-21", "android-17")]:
for item in os.listdir(opencv_samples_path): for item in os.listdir(opencv_samples_path):
item = os.path.join(opencv_samples_path, item) item = os.path.join(opencv_samples_path, item)
if (os.path.exists(os.path.join(item, "AndroidManifest.xml"))): if (os.path.exists(os.path.join(item, "AndroidManifest.xml"))):