Commit 770839fe by tonihei Committed by microkatz

Update CMake version for AV1 extension

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
(cherry picked from commit 80b635e7)
parent d2000fd2
...@@ -32,7 +32,7 @@ android { ...@@ -32,7 +32,7 @@ android {
if (project.file('src/main/jni/libgav1').exists()) { if (project.file('src/main/jni/libgav1').exists()) {
android.externalNativeBuild.cmake { android.externalNativeBuild.cmake {
path = 'src/main/jni/CMakeLists.txt' path = 'src/main/jni/CMakeLists.txt'
version = '3.7.1+' version = '3.21.0+'
if (project.hasProperty('externalNativeBuildDir')) { if (project.hasProperty('externalNativeBuildDir')) {
if (!new File(externalNativeBuildDir).isAbsolute()) { if (!new File(externalNativeBuildDir).isAbsolute()) {
ext.externalNativeBuildDir = ext.externalNativeBuildDir =
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
# 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)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
project(libgav1JNI C CXX) project(libgav1JNI C CXX)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment