From dadfea0211e3cfb6272c43240d435b4911e68730 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Mon, 14 Mar 2022 13:42:31 +0000 Subject: [PATCH] Force CMake version 3.21.0+ for the FFMPEG extension Issue: google/ExoPlayer#9933 #minor-release PiperOrigin-RevId: 434449816 --- extensions/ffmpeg/build.gradle | 3 ++- extensions/ffmpeg/src/main/jni/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle index 3bdf0a76000..44480210b06 100644 --- a/extensions/ffmpeg/build.gradle +++ b/extensions/ffmpeg/build.gradle @@ -17,7 +17,8 @@ apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" // failures if ffmpeg hasn't been built according to the README instructions. if (project.file('src/main/jni/ffmpeg').exists()) { android.externalNativeBuild.cmake.path = 'src/main/jni/CMakeLists.txt' - android.externalNativeBuild.cmake.version = '3.7.1+' + // Should match cmake_minimum_required. + android.externalNativeBuild.cmake.version = '3.21.0+' } dependencies { diff --git a/extensions/ffmpeg/src/main/jni/CMakeLists.txt b/extensions/ffmpeg/src/main/jni/CMakeLists.txt index c6a89975cf6..9b418524815 100644 --- a/extensions/ffmpeg/src/main/jni/CMakeLists.txt +++ b/extensions/ffmpeg/src/main/jni/CMakeLists.txt @@ -14,7 +14,7 @@ # limitations under the License. # -cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR) # Enable C++11 features. set(CMAKE_CXX_STANDARD 11)