loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-10 00:59:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Force CMake version 3.21.0+ for the FFMPEG extension

Browse Source 
Issue: google/ExoPlayer#9933
#minor-release
PiperOrigin-RevId: 434449816
This commit is contained in:
aquilescanta 2022-03-14 13:42:31 +00:00 committed by Oliver Woodman
parent 255007623d
commit dadfea0211
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/ffmpeg/build.gradle
View File

@ -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. // failures if ffmpeg hasn't been built according to the README instructions.
if (project.file('src/main/jni/ffmpeg').exists()) { if (project.file('src/main/jni/ffmpeg').exists()) {
android.externalNativeBuild.cmake.path = 'src/main/jni/CMakeLists.txt' 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 { dependencies {

2
extensions/ffmpeg/src/main/jni/CMakeLists.txt
View File

@ -14,7 +14,7 @@
# limitations under the License. # 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. # Enable C++11 features.
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)