Skip to content

Commit 20fef00

Browse files
asmorkalovasmorkalov
committed
android -> plarforms/android
1 parent 324cafd commit 20fef00

134 files changed

Lines changed: 34 additions & 27 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -456,15 +456,15 @@ if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
456456
endif()
457457

458458
if(ANDROID)
459-
add_subdirectory(android/service)
459+
add_subdirectory(platforms/android/service)
460460
endif()
461461

462462
if(BUILD_ANDROID_PACKAGE)
463-
add_subdirectory(android/package)
463+
add_subdirectory(platforms/android/package)
464464
endif()
465465

466466
if (ANDROID)
467-
add_subdirectory(android/libinfo)
467+
add_subdirectory(platforms/android/libinfo)
468468
endif()
469469

470470
# ----------------------------------------------------------------------------

‎android/refman.rst‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎cmake/OpenCVGenConfig.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ if(UNIX)
162162
endif()
163163

164164
if(ANDROID)
165-
install(FILES "${OpenCV_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION ${OPENCV_CONFIG_INSTALL_PATH}/)
165+
install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION ${OPENCV_CONFIG_INSTALL_PATH}/)
166166
endif()
167167

168168
# --------------------------------------------------------------------------------------------

‎doc/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ if(BUILD_DOCS AND HAVE_SPHINX)
5353
endif()
5454
endforeach()
5555

56-
file(GLOB_RECURSE _OPENCV_FILES_REF "${OpenCV_SOURCE_DIR}/android/service/doc/*.rst")
57-
file(GLOB_RECURSE _OPENCV_FILES_REF_PICT "${OpenCV_SOURCE_DIR}/android/service/doc/*.png" "${OpenCV_SOURCE_DIR}/android/service/doc/*.jpg")
56+
file(GLOB_RECURSE _OPENCV_FILES_REF "${OpenCV_SOURCE_DIR}/platforms/android/service/doc/*.rst")
57+
file(GLOB_RECURSE _OPENCV_FILES_REF_PICT "${OpenCV_SOURCE_DIR}/platforms/android/service/doc/*.png" "${OpenCV_SOURCE_DIR}/platforms/android/service/doc/*.jpg")
5858
list(APPEND OPENCV_FILES_REF ${_OPENCV_FILES_REF})
5959
list(APPEND OPENCV_FILES_REF_PICT ${_OPENCV_FILES_REF_PICT})
6060

‎doc/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
u'', 'manual'),
240240
('doc/tutorials/tutorials', 'opencv_tutorials.tex', u'The OpenCV Tutorials',
241241
u'', 'manual'),
242-
('android/refman', 'opencv2manager.tex', u'The OpenCV Manager Manual',
242+
('platforms/android/refman', 'opencv2manager.tex', u'The OpenCV Manager Manual',
243243
u'', 'manual'),
244244
]
245245

‎index.rst‎

Lines changed: 1 addition & 1 deletion

‎modules/androidcamera/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set(the_description "Auxiliary module for Android native camera support")
66
set(OPENCV_MODULE_TYPE STATIC)
77

88
ocv_define_module(androidcamera INTERNAL opencv_core log dl)
9-
ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/camera_wrapper" "${OpenCV_SOURCE_DIR}/android/service/engine/jni/include")
9+
ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/camera_wrapper" "${OpenCV_SOURCE_DIR}/platforms/android/service/engine/jni/include")
1010

1111
# Android source tree for native camera
1212
SET (ANDROID_SOURCE_TREE "ANDROID_SOURCE_TREE-NOTFOUND" CACHE PATH

android/README.android renamed to platforms/android/README.android

File renamed without changes.

android/android.toolchain.cmake renamed to platforms/android/android.toolchain.cmake

File renamed without changes.

android/java.rst renamed to platforms/android/java.rst

0 commit comments

Comments
 (0)