diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 7e22569382..0b02b7629b 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -59,6 +59,10 @@ * FFmpeg extension: * Add newly required flags to link FFmpeg libraries with NDK 23.1.7779620 and above ([#9933](https://github.com/google/ExoPlayer/issues/9933)). +* AV1 extension: + * Update CMake version to avoid incompatibilities with the latest Android + Studio releases + ([#9933](https://github.com/google/ExoPlayer/issues/9933)). ### 1.0.0-beta02 (2022-07-21) diff --git a/libraries/decoder_av1/build.gradle b/libraries/decoder_av1/build.gradle index 8479ac3d64..4534116d3e 100644 --- a/libraries/decoder_av1/build.gradle +++ b/libraries/decoder_av1/build.gradle @@ -32,7 +32,7 @@ android { if (project.file('src/main/jni/libgav1').exists()) { android.externalNativeBuild.cmake { path = 'src/main/jni/CMakeLists.txt' - version = '3.7.1+' + version = '3.21.0+' if (project.hasProperty('externalNativeBuildDir')) { if (!new File(externalNativeBuildDir).isAbsolute()) { ext.externalNativeBuildDir = diff --git a/libraries/decoder_av1/src/main/jni/CMakeLists.txt b/libraries/decoder_av1/src/main/jni/CMakeLists.txt index cb080e3c47..0202f0af57 100644 --- a/libraries/decoder_av1/src/main/jni/CMakeLists.txt +++ b/libraries/decoder_av1/src/main/jni/CMakeLists.txt @@ -14,7 +14,8 @@ # limitations under the License. # -cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR) + set(CMAKE_CXX_STANDARD 11) project(libgav1JNI C CXX)