Skip to content

Commit 0f2cb62

Browse files
committed
update ncnn
1 parent 3c0cfd5 commit 0f2cb62

4 files changed

Lines changed: 12 additions & 11 deletions

File tree

.github/workflows/release-apk.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
name: release-apk
2-
on: [push]
3-
# on:
4-
# push:
5-
# tags:
6-
# - '*'
2+
on: workflow_dispatch
73

84
env:
9-
NCNN_VERSION: 20241226
10-
BUILD_TOOLS_VERSION: 33.0.0
5+
NCNN_VERSION: 20250427
6+
BUILD_TOOLS_VERSION: 36.0.0
117

128
jobs:
139
release-apk:

app/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,14 @@ android {
2121

2222
externalNativeBuild {
2323
cmake {
24-
version "3.10.2"
24+
version "3.31.5"
2525
path file('src/main/jni/CMakeLists.txt')
2626
}
2727
}
28+
29+
packaging {
30+
jniLibs {
31+
useLegacyPackaging true
32+
}
33+
}
2834
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.tencent.squeezencnn"
43
android:versionCode="1"
54
android:versionName="1.1">
6-
<application android:label="@string/app_name" android:extractNativeLibs="true" >
5+
<application android:label="@string/app_name">
76
<activity android:name="MainActivity" android:label="@string/app_name">
87
<intent-filter>
98
<action android:name="android.intent.action.MAIN" />

app/src/main/jni/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project(squeezencnn)
22

33
cmake_minimum_required(VERSION 3.10)
44

5-
set(ncnn_DIR ${CMAKE_SOURCE_DIR}/ncnn-20241226-android-vulkan/${ANDROID_ABI}/lib/cmake/ncnn)
5+
set(ncnn_DIR ${CMAKE_SOURCE_DIR}/ncnn-20250427-android-vulkan/${ANDROID_ABI}/lib/cmake/ncnn)
66
find_package(ncnn REQUIRED)
77

88
add_library(squeezencnn SHARED squeezencnn_jni.cpp)

0 commit comments

Comments
 (0)