Skip to content

Android NDK: APP_STL gnustl_shared is no longer supported #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
karrirasinmaki wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Android NDK: APP_STL gnustl_shared is no longer supported #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# idea
.idea/
*.iml

.gradle/
local.properties

# build folders and generated sources
**/build/
app/src/main/gen/
opencv/src/main/libs/
opencv/src/main/obj/
6 changes: 0 additions & 6 deletions .idea/encodings.xml
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

119 changes: 0 additions & 119 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
-->

<resources>
<string name="app_name">OPpenCV with UVC</string>
<string name="app_name">OpenCV with UVC</string>
</resources>
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath "com.android.tools.build:gradle:4.1.0"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -28,8 +28,8 @@ task clean(type: Delete) {
ext {
supportLibVersion = '27.1.1' // variable that can be referenced to keep support libs consistent
commonLibVersion= '2.5.1'
versionBuildTool = '27.0.3'
versionCompiler = 27
versionBuildTool = '30.0.2'
versionCompiler = 30
versionTarget = 23
versionNameString = '1.0.0'
javaSourceCompatibility = JavaVersion.VERSION_1_7
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jun 20 22:40:12 JST 2018
#Thu Oct 15 18:46:54 EEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
4 changes: 4 additions & 0 deletions opencv/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ android {
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

ndk {
abiFilters "armeabi-v7a", "x86"
}
}

buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion opencv/src/main/java/com/serenegiant/opencv/ImageProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ public void onFrameAvailable(final SurfaceTexture surfaceTexture) {
private static native void nativeClassInit();
static {
if (!isInit) {
System.loadLibrary("gnustl_shared");
System.loadLibrary("c++_shared");
System.loadLibrary("common");
System.loadLibrary("opencv_java3");
System.loadLibrary("imageproc");
Expand Down
2 changes: 1 addition & 1 deletion opencv/src/main/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ APP_CPPFLAGS += -Wno-multichar
APP_ABI := armeabi-v7a x86

# STLライブラリ GNU-STLじゃないとリンクできない
APP_STL := gnustl_shared
APP_STL := c++_shared

# 出力オプション
APP_OPTIM := release
1 change: 1 addition & 0 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
include ':app', ':libuvccamera-release', ':opencv', ':usbCameraCommon-release'
rootProject.name = "OpenCVwithUVC"