update to ncnn 20241227, 16kb pagesize enabled

nihui · Dec 27, 2024 · 3c0cfd5 · 3c0cfd5
1 parent 5a58f5c
commit 3c0cfd5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/release-apk.yml b/.github/workflows/release-apk.yml
@@ -6,7 +6,7 @@ on: [push]
       # - '*'
 
 env:
-  NCNN_VERSION: 20240410
+  NCNN_VERSION: 20241226
   BUILD_TOOLS_VERSION: 33.0.0
 
 jobs:

diff --git a/app/build.gradle b/app/build.gradle
@@ -11,6 +11,12 @@ android {
         archivesBaseName = "$applicationId"
 
         minSdk 21
+
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+            }
+        }
     }
 
     externalNativeBuild {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -4,8 +4,7 @@
       android:versionCode="1"
       android:versionName="1.1">
     <application android:label="@string/app_name" android:extractNativeLibs="true" >
-        <activity android:name="MainActivity"
-                  android:label="@string/app_name">
+        <activity android:name="MainActivity" android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/app/src/main/jni/CMakeLists.txt b/app/src/main/jni/CMakeLists.txt
@@ -2,7 +2,7 @@ project(squeezencnn)
 
 cmake_minimum_required(VERSION 3.10)
 
-set(ncnn_DIR ${CMAKE_SOURCE_DIR}/ncnn-20240410-android-vulkan/${ANDROID_ABI}/lib/cmake/ncnn)
+set(ncnn_DIR ${CMAKE_SOURCE_DIR}/ncnn-20241226-android-vulkan/${ANDROID_ABI}/lib/cmake/ncnn)
 find_package(ncnn REQUIRED)
 
 add_library(squeezencnn SHARED squeezencnn_jni.cpp)

diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,4 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-id 'com.android.application' version '8.3.2' apply false
+id 'com.android.application' version '8.7.3' apply false
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 01 16:22:37 CST 2023
+#Wed Dec 25 17:36:46 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ on: [push] @@
           # - '*'
     env:
-      NCNN_VERSION: 20240410
+      NCNN_VERSION: 20241226
       BUILD_TOOLS_VERSION: 33.0.0
     jobs:
@@ Expand Down @@