loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +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 Ian Baker
parent 682a5ca77b
commit 06da55527f
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RELEASENOTES.md
View File

@ -39,6 +39,10 @@
`DEFAULT_TRACK_SELECTOR_PARAMETERS` constants. Use `DEFAULT_TRACK_SELECTOR_PARAMETERS` constants. Use
`getDefaultTrackSelectorParameters(Context)` instead when possible, and `getDefaultTrackSelectorParameters(Context)` instead when possible, and
`DEFAULT_TRACK_SELECTOR_PARAMETERS_WITHOUT_CONTEXT` otherwise. `DEFAULT_TRACK_SELECTOR_PARAMETERS_WITHOUT_CONTEXT` otherwise.
* FFmpeg extension:
* Update CMake version to `3.21.0+` to avoid a CMake bug causing
AndroidStudio's gradle sync to fail
([#9933](https://github.com/google/ExoPlayer/issues/9933)).
### 1.0.0-alpha03 (2022-03-14) ### 1.0.0-alpha03 (2022-03-14)

3
libraries/decoder_ffmpeg/build.gradle
View File

@ -17,7 +17,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/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
libraries/decoder_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)