From 66f97a607bea0d2d0f8723282ce1d8a949eaa99c Mon Sep 17 00:00:00 2001
From: Davide Garberi <dade.garberi@gmail.com>
Date: Wed, 13 Dec 2017 15:44:41 +0100
Subject: msm8996-common: Nuke MediaBuffer shim

Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
---
 libshims/Android.mk      | 12 ------------
 libshims/MediaBuffer.c   | 21 ---------------------
 msm8996.mk               |  4 ----
 rootdir/etc/init.qcom.rc |  2 +-
 4 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 libshims/MediaBuffer.c

diff --git a/libshims/Android.mk b/libshims/Android.mk
index 6d76d02..3347ab6 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -34,15 +34,3 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MULTILIB := 32
 
 include $(BUILD_SHARED_LIBRARY)
-
-# media buffer shim
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := MediaBuffer.c
-
-LOCAL_SHARED_LIBRARIES := libstagefright_foundation
-
-LOCAL_MODULE := libshims_ims
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/libshims/MediaBuffer.c b/libshims/MediaBuffer.c
deleted file mode 100644
index d8df24f..0000000
--- a/libshims/MediaBuffer.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2016 The CyanogenMod 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.
- */
-
-/* TODO: Actually provide implementations for these functions! */
-
-void _ZNK7android11MediaBuffer8refcountEv() {}
-void _ZN7android13GraphicBufferC1EP19ANativeWindowBufferb() {}
-void _ZN7android11BufferQueue17createBufferQueueEPNS_2spINS_22IGraphicBufferProducerEEEPNS1_INS_22IGraphicBufferConsumerEEERKNS1_INS_19IGraphicBufferAllocEEE () {}
diff --git a/msm8996.mk b/msm8996.mk
index d96fb32..c53b01e 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -161,10 +161,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     libsdm-disp-apis
 
-# IMS Shim
-PRODUCT_PACKAGES += \
-    libshims_ims
-
 # IPC router config
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index ca5c75e..6ffdaeb 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -38,7 +38,7 @@ on early-init
     mkdir /dsp 0771 media media
 
 on init
-    export LD_SHIM_LIBS "/system/vendor/lib/libmmcamera_ppeiscore.so|/system/lib/libshim_camera.so:/system/vendor/lib/hw/camera.vendor.msm8996.so|/system/lib/libshim_camera.so:/system/vendor/lib64/lib-imsvt.so|libshims_ims.so"
+    export LD_SHIM_LIBS "/system/vendor/lib/libmmcamera_ppeiscore.so|/system/lib/libshim_camera.so:/system/vendor/lib/hw/camera.vendor.msm8996.so|/system/lib/libshim_camera.so"
 
     # Set permissions for persist partition
     mkdir /persist 0771 system system
-- 
cgit v1.2.3