Migrate to NDK r26b

androidx · Oct 13, 2023 · 9772e08 · 9772e08
1 parent 92804df
commit 9772e08
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/libraries/decoder_ffmpeg/README.md b/libraries/decoder_ffmpeg/README.md
@@ -29,7 +29,7 @@ FFMPEG_MODULE_PATH="$(pwd)/libraries/decoder_ffmpeg/src/main"
 ```
 
 * Download the [Android NDK][] and set its location in a shell variable.
-  This build configuration has been tested on NDK r21.
+  This build configuration has been tested on NDK r26b.
 
 ```
 NDK_PATH="<path to Android NDK>"

diff --git a/libraries/decoder_ffmpeg/build.gradle b/libraries/decoder_ffmpeg/build.gradle
@@ -13,7 +13,13 @@
 // limitations under the License.
 apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
 
-android.namespace = 'androidx.media3.decoder.ffmpeg'
+android {
+    namespace = 'androidx.media3.decoder.ffmpeg'
+    defaultConfig {
+        // NDK r26+ requires at least 21
+        minSdkVersion 21
+    }
+}
 
 // Configure the native build only if ffmpeg is present to avoid gradle sync
 // failures if ffmpeg hasn't been built according to the README instructions.

diff --git a/libraries/decoder_ffmpeg/src/main/jni/build_ffmpeg.sh b/libraries/decoder_ffmpeg/src/main/jni/build_ffmpeg.sh
@@ -50,7 +50,7 @@ cd "${FFMPEG_MODULE_PATH}/jni/ffmpeg"
     --libdir=android-libs/armeabi-v7a \
     --arch=arm \
     --cpu=armv7-a \
-    --cross-prefix="${TOOLCHAIN_PREFIX}/armv7a-linux-androideabi16-" \
+    --cross-prefix="${TOOLCHAIN_PREFIX}/armv7a-linux-androideabi21-" \
     --nm="${TOOLCHAIN_PREFIX}/llvm-nm" \
     --ar="${TOOLCHAIN_PREFIX}/llvm-ar" \
     --ranlib="${TOOLCHAIN_PREFIX}/llvm-ranlib" \
@@ -78,7 +78,7 @@ make clean
     --libdir=android-libs/x86 \
     --arch=x86 \
     --cpu=i686 \
-    --cross-prefix="${TOOLCHAIN_PREFIX}/i686-linux-android16-" \
+    --cross-prefix="${TOOLCHAIN_PREFIX}/i686-linux-android21-" \
     --nm="${TOOLCHAIN_PREFIX}/llvm-nm" \
     --ar="${TOOLCHAIN_PREFIX}/llvm-ar" \
     --ranlib="${TOOLCHAIN_PREFIX}/llvm-ranlib" \