Skip to content

Commit 06da555

Browse files
AquilesCantaicbaker
authored andcommitted
Force CMake version 3.21.0+ for the FFMPEG extension
Issue: google/ExoPlayer#9933 #minor-release PiperOrigin-RevId: 434449816
1 parent 682a5ca commit 06da555

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

RELEASENOTES.md

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
`DEFAULT_TRACK_SELECTOR_PARAMETERS` constants. Use
4040
`getDefaultTrackSelectorParameters(Context)` instead when possible, and
4141
`DEFAULT_TRACK_SELECTOR_PARAMETERS_WITHOUT_CONTEXT` otherwise.
42+
* FFmpeg extension:
43+
* Update CMake version to `3.21.0+` to avoid a CMake bug causing
44+
AndroidStudio's gradle sync to fail
45+
([#9933](https://github.com/google/ExoPlayer/issues/9933)).
4246

4347
### 1.0.0-alpha03 (2022-03-14)
4448

libraries/decoder_ffmpeg/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
1717
// failures if ffmpeg hasn't been built according to the README instructions.
1818
if (project.file('src/main/jni/ffmpeg').exists()) {
1919
android.externalNativeBuild.cmake.path = 'src/main/jni/CMakeLists.txt'
20-
android.externalNativeBuild.cmake.version = '3.7.1+'
20+
// Should match cmake_minimum_required.
21+
android.externalNativeBuild.cmake.version = '3.21.0+'
2122
}
2223

2324
dependencies {

libraries/decoder_ffmpeg/src/main/jni/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
#
1616

17-
cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR)
17+
cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)
1818

1919
# Enable C++11 features.
2020
set(CMAKE_CXX_STANDARD 11)

0 commit comments

Comments
 (0)