kitakami-common: Make shim for AudioSystem::setErrorCallback()

 * Commit 000c3e4 in fw/av changed setErrorCallback() to
   addErrorCallback() to support multiple instances, but
   this breaks our old blob.

Change-Id: I03495e5746a4ad75a09a0e24bb7faf265a8b0bda

BoardConfigCommon.mk

@@ -203,7 +203,8 @@ TARGET_LD_SHIM_LIBS := \
      /system/lib/libcammw.so|libsensor.so \
      /system/vendor/lib/libizat_core.so|/system/vendor/lib/libshim_gps.so \
      /system/vendor/lib64/libizat_core.so|/system/vendor/lib64/libshim_gps.so \
-     /system/bin/secd|/system/lib64/lib-preload64.so
+     /system/bin/secd|/system/lib64/lib-preload64.so \
+     /system/vendor/lib64/libril-qc-qmi-1.so|libaudioclient_shim.so
 
 # SELinux
 include device/qcom/sepolicy-legacy/sepolicy.mk

device-common.mk

@@ -308,6 +308,7 @@ PRODUCT_PACKAGES += \
 
 # RIL
 PRODUCT_PACKAGES += \
+    libaudioclient_shim \
     libxml2
 
 # RIL Wrapper

libshim/Android.mk

@@ -47,3 +47,13 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_PROPRIETARY_MODULE := true
 
 include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := libaudioclient_shim.cpp
+LOCAL_MODULE := libaudioclient_shim
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_SHARED_LIBRARIES := libaudioclient
+LOCAL_VENDOR_MODULE := true
+
+include $(BUILD_SHARED_LIBRARY)

libshim/libaudioclient_shim.cpp

+/*
+ * Copyright (C) 2020 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <media/AudioSystem.h>
+
+extern "C" uintptr_t _ZN7android11AudioSystem16addErrorCallbackEPFviE(
+        android::audio_error_callback cb);
+
+extern "C" void _ZN7android11AudioSystem16setErrorCallbackEPFviE(
+        android::audio_error_callback cb) {
+    _ZN7android11AudioSystem16addErrorCallbackEPFviE(cb);
+}