Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a63b344

Browse filesBrowse files
committed
Fixed support for Android NDK r18, as gnustl has been removed
See: https://developer.android.com/ndk/downloads/revision_history Fixes #22
1 parent 4560b83 commit a63b344
Copy full SHA for a63b344

File tree

Expand file treeCollapse file tree

3 files changed

+3
-3
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

3 files changed

+3
-3
lines changed
Open diff view settings
Collapse file

‎.travis.yml‎

Copy file name to clipboardExpand all lines: .travis.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ android:
4242

4343
before_script:
4444
# Download Android NDK, OpenCV Android SDK and Eigen 3
45-
- if test ! -e $HOME/zip-cache/android-ndk.zip ; then wget https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip -O $HOME/zip-cache/android-ndk.zip ; fi
45+
- if test ! -e $HOME/zip-cache/android-ndk.zip ; then wget https://dl.google.com/android/repository/android-ndk-r18-linux-x86_64.zip -O $HOME/zip-cache/android-ndk.zip ; fi
4646
- if test ! -e $HOME/zip-cache/opencv-sdk.zip ; then wget https://github.com/opencv/opencv/releases/download/3.4.1/opencv-3.4.1-android-sdk.zip -O $HOME/zip-cache/opencv-sdk.zip ; fi
4747
- if test ! -e $HOME/zip-cache/eigen3.zip ; then wget https://bitbucket.org/eigen/eigen/get/3.3.4.zip -O $HOME/zip-cache/eigen3.zip ; fi
4848

Collapse file

‎app/build.gradle‎

Copy file name to clipboardExpand all lines: app/build.gradle
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
versionName '1.2.2'
1111
vectorDrawables.useSupportLibrary = true
1212
ndk {
13-
stl 'gnustl_static'
13+
stl 'c++_static'
1414
cFlags '-std=gnu++11 -fexceptions -frtti'
1515
}
1616
setProperty('archivesBaseName', rootProject.name + '-' + defaultConfig.versionName)
Collapse file

‎app/src/main/cpp/Application.mk‎

Copy file name to clipboardExpand all lines: app/src/main/cpp/Application.mk
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
APP_PLATFORM := android-27
22
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
3-
APP_STL := gnustl_static
3+
APP_STL := c++_static
44
APP_CPPFLAGS := -std=gnu++11 -frtti -fexceptions
55

66
ifeq ($(NDK_DEBUG),0)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.