commit b0e09634903a73908b84361564215a79f1f6bdb1
author Devin Moore <devinmoore@google.com> Thu Apr 22 15:41:07 2021 -0700
committer Devin Moore <devinmoore@google.com> Thu Apr 29 14:03:43 2021 -0700
tree f3533e9e352388875a975b3382efb88a113100ef
parent a79171139422e3f6001c9a8cda06de9f565d8251

DO NOT MERGE Add fmq function instantiations to preserve ABI

Bug: 184963385
Test: check abidiff after full build
Test: out/soong/.intermediates/frameworks/av/media/bufferpool/2.0/libstagefright_bufferpool@2.0/android_arm_armv8-a_vendor_shared/libstagefright_bufferpool@2.0.so.abidiff
Change-Id: I25b7180bb88b4bace4a1d9ad5a789d79cbe3de35

media/bufferpool/2.0/BufferStatus.cpp

diff --git a/media/bufferpool/2.0/BufferStatus.cpp b/media/bufferpool/2.0/BufferStatus.cpp
index 6937260..76402f2 100644
--- a/media/bufferpool/2.0/BufferStatus.cpp
+++ b/media/bufferpool/2.0/BufferStatus.cpp
@@ -21,6 +21,21 @@
 #include <time.h>
 #include "BufferStatus.h"
 
+// This is added to preserve ABI for b/184963385
+template bool android::hardware::MessageQueue<
+    android::hardware::media::bufferpool::V2_0::BufferStatusMessage,
+    android::hardware::kSynchronizedReadWrite>::
+    write(
+        const android::hardware::media::bufferpool::V2_0::BufferStatusMessage *,
+        size_t count);
+#ifndef __aarch64__
+template bool android::hardware::MessageQueue<
+    android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage,
+    android::hardware::kUnsynchronizedWrite>::
+    write(const android::hardware::media::bufferpool::V2_0::
+              BufferInvalidationMessage *,
+          size_t count);
+#endif
 namespace android {
 namespace hardware {
 namespace media {