From 6ea1d0ecf068d866faf2f1c0f4624ae5de872497 Mon Sep 17 00:00:00 2001 From: tonihei Date: Fri, 12 Aug 2022 09:43:22 +0000 Subject: [PATCH] Add additional build flags for ffmpeg on "arm64-v8a" From NDK 23.1.7779620 and above, the arm64-v8a ABI needs additional build flags to correctly link the ffmpeg libraries. Issue: google/ExoPlayer#9933 PiperOrigin-RevId: 467161973 --- extensions/ffmpeg/src/main/jni/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extensions/ffmpeg/src/main/jni/CMakeLists.txt b/extensions/ffmpeg/src/main/jni/CMakeLists.txt index 9b418524815..2a81cd54300 100644 --- a/extensions/ffmpeg/src/main/jni/CMakeLists.txt +++ b/extensions/ffmpeg/src/main/jni/CMakeLists.txt @@ -21,6 +21,12 @@ set(CMAKE_CXX_STANDARD 11) project(libffmpegJNI C CXX) +# Additional flags needed for "arm64-v8a" from NDK 23.1.7779620 and above. +# See https://github.com/google/ExoPlayer/issues/9933#issuecomment-1029775358. +if(${ANDROID_ABI} MATCHES "arm64-v8a") + set(CMAKE_CXX_FLAGS "-Wl,-Bsymbolic") +endif() + set(ffmpeg_location "${CMAKE_CURRENT_SOURCE_DIR}/ffmpeg") set(ffmpeg_binaries "${ffmpeg_location}/android-libs/${ANDROID_ABI}")