From 794186d529b9f185032e6c3eb97d78f0c75555a6 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 14 一月 2026 16:03:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
keyCabinet-android/app/build.gradle | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/keyCabinet-android/app/build.gradle b/keyCabinet-android/app/build.gradle
index a5c5f36..d7e696f 100644
--- a/keyCabinet-android/app/build.gradle
+++ b/keyCabinet-android/app/build.gradle
@@ -26,7 +26,7 @@
ndk {
moduleName "facesdk"
ldLibs "log"
- abiFilters "armeabi-v7a","x86" // "armeabi", "x86", "arm64-v8a"
+ abiFilters "arm64-v8a"
}
multiDexEnabled true
}
@@ -108,6 +108,7 @@
implementation project(path: ':settinglibrary')
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation files('libs\\simple-xml-2.7.1.jar')
+ implementation files('libs\\myservice_20240630.jar')
testImplementation deps.test.junit
androidTestImplementation deps.test.ext_junit
androidTestImplementation deps.test.test_espresso
@@ -135,4 +136,5 @@
implementation 'com.bigkoo:convenientbanner:2.0.5'
//澶村儚
implementation 'de.hdodenhof:circleimageview:3.1.0'
+
}
\ No newline at end of file
--
Gitblit v1.9.3