Fix build errors for Android builds

AOMediaCodec · Oct 14, 2024 · fb2dceb · fb2dceb
1 parent eb02b2e
commit fb2dceb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/android_jni/avifandroidjni/build.gradle b/android_jni/avifandroidjni/build.gradle
@@ -4,12 +4,12 @@ plugins {
 
 android {
     namespace 'org.aomedia.avif.android'
-    compileSdk 30
+    compileSdk 31
     ndkVersion "25.2.9519653"
 
     defaultConfig {
         minSdk 21
-        targetSdk 30
+        targetSdk 31
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/android_jni/avifandroidjni/src/main/jni/CMakeLists.txt b/android_jni/avifandroidjni/src/main/jni/CMakeLists.txt
@@ -35,7 +35,8 @@ add_library("avif_android" SHARED "libavif_jni.cc")
 
 # Import the cpu-features module to compute the number of threads used for
 # decoding.
-include(AndroidNdkModules)
-android_ndk_import_module_cpufeatures()
+set(CPU_FEATURES_DIR "${ANDROID_NDK}/sources/android/cpufeatures")
+include_directories(${CPU_FEATURES_DIR})
+add_library(cpufeatures STATIC "${CPU_FEATURES_DIR}/cpu-features.c")
 
 target_link_libraries(avif_android jnigraphics avif log cpufeatures)