Commit ea3ae1c9 authored by 姜天宇's avatar 姜天宇

feat:增加arm64支持

parent bb408cc9
...@@ -3,8 +3,8 @@ plugins { ...@@ -3,8 +3,8 @@ plugins {
id 'org.jetbrains.kotlin.android' id 'org.jetbrains.kotlin.android'
} }
def APP_VERSION_CODE = 1000203 def APP_VERSION_CODE = 1000204
def APP_VERSION_NAME = "1.0.2.3" def APP_VERSION_NAME = "1.0.2.4"
android { android {
namespace 'com.wmdigit.cateringdetect' namespace 'com.wmdigit.cateringdetect'
...@@ -34,7 +34,7 @@ android { ...@@ -34,7 +34,7 @@ android {
signingConfig signingConfigs.release signingConfig signingConfigs.release
ndk { ndk {
abiFilters 'armeabi-v7a' abiFilters 'armeabi-v7a', 'arm64-v8a'
} }
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
......
...@@ -9,6 +9,10 @@ android { ...@@ -9,6 +9,10 @@ android {
defaultConfig { defaultConfig {
minSdk 24 minSdk 24
ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a'
}
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
} }
......
...@@ -10,7 +10,7 @@ android { ...@@ -10,7 +10,7 @@ android {
minSdk 24 minSdk 24
ndk { ndk {
abiFilters 'armeabi-v7a' abiFilters 'armeabi-v7a','arm64-v8a'
// abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64' // abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
} }
......
...@@ -40,14 +40,6 @@ set_target_properties( ...@@ -40,14 +40,6 @@ set_target_properties(
${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libc++_shared.so ${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libc++_shared.so
) )
# todo 测试用
#add_library(retri SHARED IMPORTED)
#set_target_properties(
# retri
# PROPERTIES IMPORTED_LOCATION
# ${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libretri.a
#)
# hnsw索引库 # hnsw索引库
add_library(hnsw SHARED IMPORTED) add_library(hnsw SHARED IMPORTED)
set_target_properties( set_target_properties(
......
...@@ -13,7 +13,7 @@ android { ...@@ -13,7 +13,7 @@ android {
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
ndk { ndk {
abiFilters 'armeabi-v7a' abiFilters 'armeabi-v7a', 'arm64-v8a'
} }
externalNativeBuild { externalNativeBuild {
......
...@@ -28,6 +28,7 @@ v1.0.2.3 2025/05/08 1.增加GPU推理 ...@@ -28,6 +28,7 @@ v1.0.2.3 2025/05/08 1.增加GPU推理
2.增加纠错功能 2.增加纠错功能
3.学习页增加重置背景功能 3.学习页增加重置背景功能
4.修复部分设备USB相机格式不兼容的问题 4.修复部分设备USB相机格式不兼容的问题
v1.0.2.4 2025/05/13 1.增加arm64支持
todo 增加学习记录管理模块 todo 增加学习记录管理模块
......
...@@ -109,7 +109,7 @@ android { ...@@ -109,7 +109,7 @@ android {
versionName openCVersionName versionName openCVersionName
ndk { ndk {
abiFilters 'armeabi-v7a' abiFilters 'armeabi-v7a', 'arm64-v8a'
} }
externalNativeBuild { externalNativeBuild {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment