Skip to content

Commit

Permalink
Update CMake version for AV1 extension
Browse files Browse the repository at this point in the history
The specified CMake version doesn't work with the latest
Android Studio releases. Updating to a more recent version
fixes the problem.

Issue: google/ExoPlayer#9933
PiperOrigin-RevId: 467634063
  • Loading branch information
tonihei authored and marcbaechinger committed Sep 30, 2022
1 parent 43ede97 commit 9e1d4f6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions RELEASENOTES.md
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion libraries/decoder_av1/build.gradle
Expand Up @@ -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 =
Expand Down
3 changes: 2 additions & 1 deletion libraries/decoder_av1/src/main/jni/CMakeLists.txt
Expand Up @@ -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)
Expand Down

0 comments on commit 9e1d4f6

Please sign in to comment.