Skip to content

Commit eeb991a

Browse files
authored
Android 2025 - OpenCV / NDK 28 (#521)
* actions * Android NDK -> 28.0.13004108 * android cache off and calculate formuales * NDK settings * opencv android updated script * Android disable examples/android examples * Android and opencv config fixes * Android opencv * opencv * opencv android fix copy * opencv copy * opencv workflows on * disable action
1 parent 4fa2944 commit eeb991a

File tree

4 files changed

+199
-137
lines changed

4 files changed

+199
-137
lines changed

.github/workflows/build-android.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
TARGET: "android"
1313
NO_FORCE: 1
1414
GA_CI_SECRET: ${{ secrets.CI_SECRET }}
15-
USE_ARTIFACT: true
15+
USE_ARTIFACT: false
1616
DISABLE_WORKFLOW: "false"
1717

1818
concurrency:
@@ -43,13 +43,12 @@ jobs:
4343
matrix:
4444
ARCH: [armv7, arm64, x86_64]
4545
SDK: ["35.0.0"]
46-
NDK: ["27.2.12479018"] #"26.3.11579264",
46+
NDK: ["28.0.13004108"]
4747
API: ["24"]
4848
env:
4949
ARCH: ${{ matrix.ARCH }}
5050
SDK: ${{ matrix.SDK }}
5151
NDK: ${{ matrix.NDK }}
52-
NDK_ROOT: ${{ matrix.NDK }}
5352
ANDROID_API: ${{ matrix.API }}
5453
steps:
5554
- uses: actions/[email protected]

apothecary/configure/android_configure.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,18 @@ export ANDROID_ABI=$1
1919
export BUILD_SYSTEM=${2:-make}
2020

2121
export TOOLCHAIN_ROOT="${APOTHECARY_LEVEL}/android"
22-
export NDK_ROOT="${ANDROID_NDK_ROOT}"
22+
23+
if [ "${NDK:-}" == "27.2.12479018" ]; then
24+
export NDK_ROOT="${ANDROID_NDK_ROOT:-}"
25+
elif [ "${NDK:-}" == "28.0.13004108" ]; then
26+
if [ -n "${ANDROID_NDK_LATEST_HOME}" ]; then
27+
export ANDROID_NDK_ROOT=${ANDROID_NDK_LATEST_HOME}
28+
fi
29+
export NDK_ROOT="${ANDROID_NDK_ROOT:-}"
30+
else
31+
echo "Error: NDK path variable not set" >&2
32+
exit 1
33+
fi
2334

2435
export HOST_ARCH=$(uname -m)
2536
case "$(uname)" in

0 commit comments

Comments
 (0)