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

Update CMake version for AV1 extension

Browse Source 
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
This commit is contained in:
tonihei 2022-08-15 10:49:44 +00:00 committed by Marc Baechinger
parent 9a7fde8fde
commit 80b635e7ab
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/av1/build.gradle
View File

@ -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 =

3
extensions/av1/src/main/jni/CMakeLists.txt
View File

@ -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)