Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
5f9bb624
Commit
5f9bb624
authored
Jan 05, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
android: IPPICV static libraries workarounds for NDK 16
parent
b76a691b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
0 deletions
+17
-0
OpenCVFindLibsPerf.cmake
cmake/OpenCVFindLibsPerf.cmake
+7
-0
OpenCV.mk.in
cmake/templates/OpenCV.mk.in
+10
-0
No files found.
cmake/OpenCVFindLibsPerf.cmake
View file @
5f9bb624
...
...
@@ -18,6 +18,13 @@ if(WITH_IPP)
endif
()
ocv_include_directories
(
${
IPP_INCLUDE_DIRS
}
)
list
(
APPEND OPENCV_LINKER_LIBS
${
IPP_LIBRARIES
}
)
# Details: #10229
if
(
ANDROID AND NOT OPENCV_SKIP_ANDROID_IPP_FIX_1
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"-Wl,--exclude-libs,libippicv.a -Wl,--exclude-libs,libippiw.a
${
CMAKE_SHARED_LINKER_FLAGS
}
"
)
elseif
(
ANDROID AND NOT OPENCV_SKIP_ANDROID_IPP_FIX_2
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"-Wl,-Bsymbolic
${
CMAKE_SHARED_LINKER_FLAGS
}
"
)
endif
()
endif
()
endif
()
...
...
cmake/templates/OpenCV.mk.in
View file @
5f9bb624
...
...
@@ -88,6 +88,16 @@ LOCAL_STATIC_LIBRARIES:=$(USER_LOCAL_STATIC_LIBRARIES)
LOCAL_SHARED_LIBRARIES:=$(USER_LOCAL_SHARED_LIBRARIES)
LOCAL_LDLIBS:=$(USER_LOCAL_LDLIBS)
# Details: #10229
ifeq ($(OPENCV_SKIP_ANDROID_IPP_FIX_1),)
LOCAL_LDFLAGS += -Wl,--exclude-libs,libippicv.a
LOCAL_LDFLAGS += -Wl,--exclude-libs,libippiw.a
else
ifeq ($(OPENCV_SKIP_ANDROID_IPP_FIX_2),)
LOCAL_LDFLAGS += -Wl,-Bsymbolic
endif
endif
LOCAL_C_INCLUDES += $(OPENCV_LOCAL_C_INCLUDES)
LOCAL_CFLAGS += $(OPENCV_LOCAL_CFLAGS)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment