From 67a56e699f49ad961db6bafea8b8b6d86cab3448 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Mon, 24 Apr 2023 11:54:57 +0200 Subject: Exclude a file from Unity Build If not excluded, - `rwLock` will collide with `wrappers/jni/androidmediaplayer.cpp`, - and `notifyFrameAvailable` will be confused by the one defined in `wrappers/jni/androidsurfacetexture.cpp` Task-number: QTBUG-109394 Change-Id: I50a891449f4631caceb088a79e26c709df063931 Reviewed-by: Joerg Bornemann (cherry picked from commit d6dffee9592a198669c7284a0a10179143d69654) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/multimedia/android/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/multimedia/android/CMakeLists.txt b/src/plugins/multimedia/android/CMakeLists.txt index c38648379..b66bd4e59 100644 --- a/src/plugins/multimedia/android/CMakeLists.txt +++ b/src/plugins/multimedia/android/CMakeLists.txt @@ -29,6 +29,12 @@ qt_internal_add_plugin(QAndroidMediaPlugin wrappers/jni/androidmultimediautils.cpp wrappers/jni/androidmultimediautils_p.h wrappers/jni/androidsurfacetexture.cpp wrappers/jni/androidsurfacetexture_p.h wrappers/jni/androidsurfaceview.cpp wrappers/jni/androidsurfaceview_p.h + NO_UNITY_BUILD_SOURCES + # Resolves two problems: + # - Collision of `rwLock` with wrappers/jni/androidmediaplayer.cpp + # - and redefinition of `notifyFrameAvailable` with different signature + # with wrappers/jni/androidsurfacetexture.cpp + wrappers/jni/androidcamera.cpp INCLUDE_DIRECTORIES audio common -- cgit v1.2.1