From 91f10ef3db8588eb523275d07c5f0b9d3e5fb93f Mon Sep 17 00:00:00 2001 From: Danny Wood Date: Fri, 29 Nov 2019 11:31:11 +0000 Subject: [PATCH] universal7580: remove the libExynosOMX shim as this is now patched in our blobs Change-Id: If13efdfabb79c8ac19b16cc1869877cd221a9c1c --- .../android.hardware.media.omx@1.0-service.rc | 7 --- device-common.mk | 2 - libshims/libExynosOMX/Android.mk | 29 --------- .../libExynosOMX/Exynos_OMX_VdecControl.c | 61 ------------------- proprietary-files-bsp.txt | 11 ++++ proprietary-files.txt | 6 -- 6 files changed, 11 insertions(+), 105 deletions(-) delete mode 100644 configs/init/android.hardware.media.omx@1.0-service.rc delete mode 100644 libshims/libExynosOMX/Android.mk delete mode 100644 libshims/libExynosOMX/Exynos_OMX_VdecControl.c diff --git a/configs/init/android.hardware.media.omx@1.0-service.rc b/configs/init/android.hardware.media.omx@1.0-service.rc deleted file mode 100644 index 2f2d31c..0000000 --- a/configs/init/android.hardware.media.omx@1.0-service.rc +++ /dev/null @@ -1,7 +0,0 @@ -service mediacodec /vendor/bin/hw/android.hardware.media.omx@1.0-service - class main - user mediacodec - group camera drmrpc mediadrm - ioprio rt 4 - writepid /dev/cpuset/foreground/tasks - setenv LD_PRELOAD "/vendor/lib/libExynosOMX_shim.so" diff --git a/device-common.mk b/device-common.mk index 0f580c4..f160bc0 100644 --- a/device-common.mk +++ b/device-common.mk @@ -159,7 +159,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ libcamera_client_shim \ libexynoscamera_shim \ - libExynosOMX_shim \ libstagefright_shim \ libui_shim @@ -195,7 +194,6 @@ PRODUCT_PACKAGES += \ # Overriden service definition PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/init/android.hardware.media.omx@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.media.omx@1.0-service.rc \ $(LOCAL_PATH)/configs/init/mediaserver.rc:system/etc/init/mediaserver.rc # Properties diff --git a/libshims/libExynosOMX/Android.mk b/libshims/libExynosOMX/Android.mk deleted file mode 100644 index ad33af9..0000000 --- a/libshims/libExynosOMX/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (C) 2018 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. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := Exynos_OMX_VdecControl.c - -LOCAL_SHARED_LIBRARIES := liblog - -LOCAL_MODULE := libExynosOMX_shim -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PROPRIETARY_MODULE := true - -include $(BUILD_SHARED_LIBRARY) diff --git a/libshims/libExynosOMX/Exynos_OMX_VdecControl.c b/libshims/libExynosOMX/Exynos_OMX_VdecControl.c deleted file mode 100644 index 68b1739..0000000 --- a/libshims/libExynosOMX/Exynos_OMX_VdecControl.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2017 TeamNexus - * - * 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. - */ - -#define LOG_TAG "libExynosOMX_shim" - -#include -#include -#include - -int Exynos_OSAL_Strcmp(const char *s1, const char *s2) -{ - void *ptr; - int ret; - Dl_info info; - - /* get address of parent function */ - ptr = __builtin_return_address(0); - - /* skip index-check if we couldn't get return-address */ - if (!ptr) { - ALOGE("%s: failed to retrieve return address", __func__); - goto exit; - } - - /* get infos about parent function */ - ret = dladdr(ptr, &info); - - /* skip index-check if we couldn't get infos about parent function */ - if (!ret) { - ALOGE("%s: failed to retrieve informations about parent function", __func__); - goto exit; - } - - /* check if the parent function is Exynos_OMX_VideoDecodeGetExtensionIndex() */ - if (strcmp(info.dli_sname, "Exynos_OMX_VideoDecodeGetExtensionIndex")) { - /* no log here... */ - goto exit; - } - - /* prevent check for storeMetaDataInBuffers-support to succeed */ - if (!strcmp(s1, "OMX.google.android.index.storeMetaDataInBuffers")) { - ALOGI("%s: failing check for storeMetaDataInBuffers-support", __func__); - return -1; - } - -exit: - return strcmp(s1, s2); -} diff --git a/proprietary-files-bsp.txt b/proprietary-files-bsp.txt index a61e264..ec6cf20 100644 --- a/proprietary-files-bsp.txt +++ b/proprietary-files-bsp.txt @@ -22,3 +22,14 @@ lib/libMcRegistry.so lib/libExynosOMX_Core.so lib/libExynosOMX_Resourcemanager.so lib/libstagefrighthw.so +lib/omx/libOMX.Exynos.AVC.Decoder.so +lib/omx/libOMX.Exynos.AVC.Encoder.so +lib/omx/libOMX.Exynos.MPEG4.Decoder.so +lib/omx/libOMX.Exynos.MPEG4.Encoder.so +lib/omx/libOMX.Exynos.VP8.Decoder.so +lib/omx/libOMX.Exynos.VP8.Encoder.so +lib/omx/libOMX.Exynos.HEVC.Decoder.so +lib/omx/libOMX.Exynos.HEVC.Encoder.so +lib/omx/libOMX.Exynos.MPEG2.Decoder.so +lib/omx/libOMX.Exynos.VP9.Decoder.so + diff --git a/proprietary-files.txt b/proprietary-files.txt index 2c117c1..a2a8ef2 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -23,12 +23,6 @@ bin/cs:vendor/bin/cs lib/libprotobuf-cpp-fl26.so|f2436050b38e5acb63d36ad7b24a0c2612d68749 # OMX - from a3xeltexx (A310FXXU4CRG2) -lib/omx/libOMX.Exynos.AVC.Decoder.so|068a5120f2b4adbe888293931c2ddae92dcecd49 -lib/omx/libOMX.Exynos.AVC.Encoder.so|eaef14d4c26e6b0d27ba8a7d3ba109810450053a -lib/omx/libOMX.Exynos.MPEG4.Decoder.so|4246f3d7695da33c482852eb4bd34a56c9183b48 -lib/omx/libOMX.Exynos.MPEG4.Encoder.so|371668ced35a70f327b3e723d774a14505cff341 -lib/omx/libOMX.Exynos.VP8.Decoder.so|338a089ac76e867eb795343dce4ee2b5326b0c77 -lib/omx/libOMX.Exynos.VP8.Encoder.so|2f13479cc28b6e3cfa92202326bc26e812a4f620 lib/omx/libOMX.Exynos.WMV.Decoder.so|829ee8de0450615bf573c418d5205de3c33b50a1 # RIL -- 2.20.1