Skip to content

Commit c0b6dc3

Browse files
committed
change libs
1 parent 29ca2e2 commit c0b6dc3

File tree

9 files changed

+23
-14
lines changed

9 files changed

+23
-14
lines changed

app/build.gradle.kts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ android {
2626
applicationId = "neth.iecal.questphone"
2727
minSdk = 26
2828
targetSdk = 36
29-
versionCode = 6
30-
versionName = "1.5"
29+
versionCode = 7
30+
versionName = "1.6"
3131
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3232

3333
buildConfigField("String", "SUPABASE_URL", "\"${localProperties["SUPABASE_URL"]}\"")
@@ -48,8 +48,16 @@ android {
4848
versionNameSuffix = "-play"
4949
buildConfigField("Boolean", "IS_FDROID", "false")
5050
}
51-
}
5251

52+
}
53+
splits {
54+
abi {
55+
isEnable = true
56+
reset()
57+
include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
58+
isUniversalApk = true
59+
}
60+
}
5361
buildTypes {
5462
release {
5563
isMinifyEnabled = false
@@ -77,6 +85,7 @@ android {
7785
path = file("src/main/cpp/CMakeLists.txt")
7886
}
7987
}
88+
8089
ndkVersion = "29.0.13599879 rc2"
8190
}
8291

app/src/main/cpp/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ project("sentencepiece_jni")
33

44
add_library(sentencepiece SHARED IMPORTED)
55
set_target_properties(sentencepiece PROPERTIES IMPORTED_LOCATION
6-
${CMAKE_SOURCE_DIR}/../jniLibs/arm64-v8a/libsentencepiece.so)
7-
6+
${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libsentencepiece.so)
87

98
add_library(sentencepiece_jni SHARED sentencepiece_jni.cpp)
109

@@ -13,4 +12,4 @@ find_library(log-lib log)
1312
target_include_directories(sentencepiece_jni PRIVATE
1413
${CMAKE_SOURCE_DIR}/../sentencepiece/include/sentencepiece)
1514

16-
target_link_libraries(sentencepiece_jni sentencepiece ${log-lib})
15+
target_link_libraries(sentencepiece_jni sentencepiece ${log-lib})

app/src/main/jniLibs/arm64-v8a/libsentencepiece.so

100644100755
-11.5 MB
Binary file not shown.

app/src/main/jniLibs/armeabi-v7a/libsentencepiece.so

100644100755
-9.7 MB
Binary file not shown.

app/src/main/jniLibs/x86/libsentencepiece.so

100644100755
-9.25 MB
Binary file not shown.

app/src/main/jniLibs/x86_64/libsentencepiece.so

100644100755
-10.9 MB
Binary file not shown.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:accessibilityEventTypes="typeAllMask"
4+
android:accessibilityFeedbackType="feedbackGeneric"
5+
android:notificationTimeout="100"
6+
android:isAccessibilityTool="false"
7+
android:canRetrieveWindowContent="false"
8+
android:description="@string/lock_screen_service_description" />

app/src/main/res/xml/app_blocker_service_config.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

app/src/main/res/xml/lockscreen_service_config.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
android:accessibilityEventTypes="typeAllMask"
44
android:accessibilityFeedbackType="feedbackGeneric"
55
android:notificationTimeout="100"
6+
android:isAccessibilityTool="false"
67
android:canRetrieveWindowContent="false"
78
android:description="@string/lock_screen_service_description" />

0 commit comments

Comments
 (0)