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
bb45bf96
Commit
bb45bf96
authored
Aug 27, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
android: NDK17 support
tested with NDK 17b (17.1.4828580)
parent
d10a2198
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
build_sdk.py
platforms/android/build_sdk.py
+5
-1
ndk-17.config.py
platforms/android/ndk-17.config.py
+6
-0
No files found.
platforms/android/build_sdk.py
View file @
bb45bf96
...
...
@@ -106,9 +106,13 @@ class ABI:
self
.
cmake_vars
=
dict
(
ANDROID_STL
=
"gnustl_static"
,
ANDROID_ABI
=
self
.
name
,
ANDROID_TOOLCHAIN_NAME
=
toolchain
,
ANDROID_PLATFORM_ID
=
platform_id
,
)
if
toolchain
is
not
None
:
self
.
cmake_vars
[
'ANDROID_TOOLCHAIN_NAME'
]
=
toolchain
else
:
self
.
cmake_vars
[
'ANDROID_TOOLCHAIN'
]
=
'clang'
self
.
cmake_vars
[
'ANDROID_STL'
]
=
'c++_static'
if
ndk_api_level
:
self
.
cmake_vars
[
'ANDROID_NATIVE_API_LEVEL'
]
=
ndk_api_level
self
.
cmake_vars
.
update
(
cmake_vars
)
...
...
platforms/android/ndk-17.config.py
0 → 100644
View file @
bb45bf96
ABIs
=
[
ABI
(
"2"
,
"armeabi-v7a"
,
None
,
cmake_vars
=
dict
(
ANDROID_ABI
=
'armeabi-v7a with NEON'
)),
ABI
(
"3"
,
"arm64-v8a"
,
None
),
ABI
(
"5"
,
"x86_64"
,
None
),
ABI
(
"4"
,
"x86"
,
None
),
]
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