From d482c4f1e04417a49fd10f99f94af62e3ea7e1da Mon Sep 17 00:00:00 2001 From: Daniel Jacob Chittoor Date: Tue, 13 Sep 2022 10:55:48 +0530 Subject: [PATCH] bufferpool: Address ABI breakage for x86_64 targets FMQ function instantiations should also be guarded against x86_64 along with aarch64 to prevent ABI breakage. Test: check `compatibility_status` on abidiff after full build Test: out/soong/.intermediates/frameworks/av/media/bufferpool/2.0/libstagefright_bufferpool@2.0/android_x86_64_vendor_shared/libstagefright_bufferpool@2.0.so.abidiff Signed-off-by: Daniel Jacob Chittoor --- media/bufferpool/2.0/BufferStatus.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/bufferpool/2.0/BufferStatus.cpp b/media/bufferpool/2.0/BufferStatus.cpp index 76402f2ee6..c4adc6f333 100644 --- a/media/bufferpool/2.0/BufferStatus.cpp +++ b/media/bufferpool/2.0/BufferStatus.cpp @@ -28,7 +28,7 @@ template bool android::hardware::MessageQueue< write( const android::hardware::media::bufferpool::V2_0::BufferStatusMessage *, size_t count); -#ifndef __aarch64__ +#if ! defined(__aarch64__) && ! defined(__x86_64__) template bool android::hardware::MessageQueue< android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>:: -- GitLab