From 8bdd0a93428b7054024553bc88fb780aebd06474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maidu=20=C3=9Cle?= <maidu@high-mobility.com>
Date: Tue, 16 Sep 2025 22:31:21 +0300
Subject: [PATCH] Updated NDK build

---
 .github/workflows/gradle.yml              | 2 +-
 build.gradle                              | 2 +-
 hmkit-android/build.gradle                | 6 ++++++
 hmkit-android/src/main/jni/Application.mk | 2 +-
 hmkit-core-jni                            | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 38b5a5ee..b22f9845 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Set up NDK
         uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r21e
+          ndk-version: r28c
       - name: update submodules
         env:
           SSH_AUTH_SOCK: /tmp/ssh_agent.sock
diff --git a/build.gradle b/build.gradle
index 88027289..683694d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext.ver = [
         "hmkit-core-jni"    : "1.0.2",
         "hmkit-crypto"      : "1.4.6",
         "hmkit-utils"       : "1.4.5",
-        "hmkit-android"     : "2.0.9",
+        "hmkit-android"     : "2.0.10",
         "hmkit-auto-api"    : "13.1.1",
         "command-queue"     : "1.1.1",
         compileSdk          : 28
diff --git a/hmkit-android/build.gradle b/hmkit-android/build.gradle
index 091c4f8b..eb5803d5 100644
--- a/hmkit-android/build.gradle
+++ b/hmkit-android/build.gradle
@@ -11,6 +11,12 @@ apply from: "https://raw.githubusercontent.com/tonisives/tools/master/gradle/tes
 version ver."${deploy.id}"
 
 android {
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
+
     compileSdkVersion ver.compileSdk
     namespace 'com.highmobility.hmkit'
 
diff --git a/hmkit-android/src/main/jni/Application.mk b/hmkit-android/src/main/jni/Application.mk
index 602c90d1..4e39cee8 100644
--- a/hmkit-android/src/main/jni/Application.mk
+++ b/hmkit-android/src/main/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_PLATFORM=android-21
-APP_ABI := all
+APP_ABI := arm64-v8a x86_64
 APP_CPPFLAGS += -fexceptions
 APP_STL := c++_static
\ No newline at end of file
diff --git a/hmkit-core-jni b/hmkit-core-jni
index 21bec38a..8685bcfe 160000
--- a/hmkit-core-jni
+++ b/hmkit-core-jni
@@ -1 +1 @@
-Subproject commit 21bec38a1d089d1ebff5110a4ca5f1eba46213c2
+Subproject commit 8685bcfe6aeb027712f3511031c8eea4800988d9