From 5c90c9c663105842c983be3250d40128848a691d Mon Sep 17 00:00:00 2001
From: DAndreas Schneider <asn@cryptomilk.org>
Date: Sat, 14 Nov 2020 22:16:35 +0530
Subject: [PATCH] universal7885: Shim libstagefright_omx_utils.so

 * F linker  : CANNOT LINK EXECUTABLE "/vendor/bin/hw/android.hardware.media.omx@1.0-service": cannot locate symbol "_ZN7android24MEDIA_MIMETYPE_AUDIO_IMAE" referenced by "/vendor/lib/libstagefright_omx_utils.so"

Signed-off-by: SamarV-121 <samarvispute121@gmail.com>
Change-Id: I446fc75abf371cc220e40a173e000415a33dd7db
---
 extract-files.sh        |  1 +
 libshims/Android.mk     | 12 ++++++++++++
 libshims/MediaDefs.cpp  | 19 +++++++++++++++++++
 universal7904-common.mk |  4 ++++
 4 files changed, 36 insertions(+)
 create mode 100644 libshims/Android.mk
 create mode 100644 libshims/MediaDefs.cpp

diff --git a/extract-files.sh b/extract-files.sh
index c7575f1..6f40b96 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -70,5 +70,6 @@ patchelf --replace-needed "libkeymaster_portable.so" "libkeymaster_portable-v29.
 patchelf --replace-needed "libkeymaster_portable.so" "libkeymaster_portable-v29.so" "${BLOB_ROOT}/vendor/lib/libkeymaster3device.so"
 patchelf --replace-needed "libpuresoftkeymasterdevice.so" "libpuresoftkeymasterdevice-v29.so" "${BLOB_ROOT}/vendor/lib64/libkeymaster3device.so"
 patchelf --replace-needed "libpuresoftkeymasterdevice.so" "libpuresoftkeymasterdevice-v29.so" "${BLOB_ROOT}/vendor/lib/libkeymaster3device.so"
+patchelf --add-needed "libshim_stagefright_foundation.so" "${BLOB_ROOT}/vendor/lib/libstagefright_omx_utils.so"
 
 "${MY_DIR}/setup-makefiles.sh"
diff --git a/libshims/Android.mk b/libshims/Android.mk
new file mode 100644
index 0000000..9189ee1
--- /dev/null
+++ b/libshims/Android.mk
@@ -0,0 +1,12 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := MediaDefs.cpp
+LOCAL_SHARED_LIBRARIES := libstagefright_foundation
+LOCAL_MODULE := libshim_stagefright_foundation
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_VENDOR_MODULE := true
+
+include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/libshims/MediaDefs.cpp b/libshims/MediaDefs.cpp
new file mode 100644
index 0000000..1212882
--- /dev/null
+++ b/libshims/MediaDefs.cpp
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2020 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.
+ */
+
+namespace android {
+    const char *MEDIA_MIMETYPE_AUDIO_IMA = "audio/x-ima";
+} // namespece android
\ No newline at end of file
diff --git a/universal7904-common.mk b/universal7904-common.mk
index c54f6ad..cf21a8b 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -105,6 +105,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     build/target/product/gsi/gsi_skip_mount.cfg:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/config/skip_mount.cfg
 
+# Shims
+PRODUCT_PACKAGES += \
+    libshim_stagefright_foundation
+
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)