diff --git a/app/build.gradle b/app/build.gradle index f2ce4cee..9d507e72 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,7 +46,7 @@ android { ] } } - ndk { } + ndk {} } buildTypes { debug { @@ -62,7 +62,7 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release - applicationIdSuffix ".modify" + applicationIdSuffix ".modify.opencv4" } } compileOptions { @@ -110,6 +110,11 @@ android { buildConfigField "String", "CHANNEL", '"coolapk"' } } + externalNativeBuild { + cmake { + arguments "-DANDROID_STL=c++_shared" + } + } // 避免压缩TensorFlow // aaptOptions { // noCompress "tflite" @@ -117,8 +122,6 @@ android { } - - repositories { flatDir { dirs 'libs' diff --git a/app/libs/opencv-3.4.13.aar b/app/libs/opencv-3.4.13.aar deleted file mode 100644 index 1e70982c..00000000 Binary files a/app/libs/opencv-3.4.13.aar and /dev/null differ diff --git a/app/libs/opencv-4.5.1.aar b/app/libs/opencv-4.5.1.aar new file mode 100644 index 00000000..1531728c Binary files /dev/null and b/app/libs/opencv-4.5.1.aar differ diff --git a/inrt/src/main/jniLibs/armeabi-v7a/libopencv_java3.so b/app/src/main/jniLibs/armeabi-v7a/libopencv_java4.so similarity index 55% rename from inrt/src/main/jniLibs/armeabi-v7a/libopencv_java3.so rename to app/src/main/jniLibs/armeabi-v7a/libopencv_java4.so index bf52b421..b8b7bfcc 100644 Binary files a/inrt/src/main/jniLibs/armeabi-v7a/libopencv_java3.so and b/app/src/main/jniLibs/armeabi-v7a/libopencv_java4.so differ diff --git a/autojs/build.gradle b/autojs/build.gradle index 46ab4659..1ebd2d5f 100644 --- a/autojs/build.gradle +++ b/autojs/build.gradle @@ -55,8 +55,7 @@ dependencies { api 'com.github.hyb1996:EnhancedFloaty:0.31' api 'com.makeramen:roundedimageview:2.3.0' // OpenCv -// api(name: 'opencv-3.4.13', ext: 'aar') - api files('libs/opencv-3.4.13.aar') + api files('libs/opencv-4.5.1.aar') // OkHttp api 'com.squareup.okhttp3:okhttp:3.10.0' // JDeferred diff --git a/autojs/libs/opencv-3.4.13.aar b/autojs/libs/opencv-3.4.13.aar deleted file mode 100644 index 1e70982c..00000000 Binary files a/autojs/libs/opencv-3.4.13.aar and /dev/null differ diff --git a/autojs/libs/opencv-4.5.1.aar b/autojs/libs/opencv-4.5.1.aar new file mode 100644 index 00000000..1531728c Binary files /dev/null and b/autojs/libs/opencv-4.5.1.aar differ diff --git a/inrt/libs/opencv-3.4.13.aar b/inrt/libs/opencv-3.4.13.aar deleted file mode 100644 index 1e70982c..00000000 Binary files a/inrt/libs/opencv-3.4.13.aar and /dev/null differ diff --git a/inrt/libs/opencv-4.5.1.aar b/inrt/libs/opencv-4.5.1.aar new file mode 100644 index 00000000..1531728c Binary files /dev/null and b/inrt/libs/opencv-4.5.1.aar differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libopencv_java3.so b/inrt/src/main/jniLibs/armeabi-v7a/libopencv_java4.so similarity index 55% rename from app/src/main/jniLibs/armeabi-v7a/libopencv_java3.so rename to inrt/src/main/jniLibs/armeabi-v7a/libopencv_java4.so index bf52b421..b8b7bfcc 100644 Binary files a/app/src/main/jniLibs/armeabi-v7a/libopencv_java3.so and b/inrt/src/main/jniLibs/armeabi-v7a/libopencv_java4.so differ