From 2725f5354afc113c7ea675ad97e55ee3970b6bcf Mon Sep 17 00:00:00 2001 From: Steven Lay Date: Tue, 25 Jul 2017 02:29:20 +0000 Subject: shinano-common: remove libwvm shim * With the introduction of kipper widevine blobs, a shim for libwvm is no longer necessary Change-Id: I82c44e74dcdbb88e50536ca23c64fe2927b5f1eb --- libshims/Android.mk | 13 ------------- libshims/wvm.c | 21 --------------------- rootdir/init.camera.rc | 4 +--- shinano.mk | 1 - 4 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 libshims/wvm.c diff --git a/libshims/Android.mk b/libshims/Android.mk index e4bfd9f..5d4e445 100644 --- a/libshims/Android.mk +++ b/libshims/Android.mk @@ -15,19 +15,6 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := wvm.c - -LOCAL_SHARED_LIBRARIES := libstagefright_foundation - -LOCAL_MODULE := libshims_wvm -LOCAL_MODULE_TAGS := optional - -LOCAL_32_BIT_ONLY := true - -include $(BUILD_SHARED_LIBRARY) - include $(CLEAR_VARS) LOCAL_SRC_FILES := signal.c LOCAL_MODULE := libshims_signal diff --git a/libshims/wvm.c b/libshims/wvm.c deleted file mode 100644 index 422a6d5..0000000 --- a/libshims/wvm.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. - */ - -/* MediaBufferGroup::MediaBufferGroup */ -int _ZN7android16MediaBufferGroupC1Ej(unsigned int); -int _ZN7android16MediaBufferGroupC1Ev() { - return _ZN7android16MediaBufferGroupC1Ej(0); -} diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc index f85e4c6..3025e8f 100644 --- a/rootdir/init.camera.rc +++ b/rootdir/init.camera.rc @@ -16,12 +16,10 @@ on init export LD_SHIM_LIBS " \ -/system/vendor/lib/libwvm.so|libshims_wvm.so \ -:/system/bin/credmgrd|libshims_signal.so \ +/system/bin/credmgrd|libshims_signal.so \ :/system/bin/iddd|libshims_idd.so \ :/system/bin/suntrold|libshims_signal.so \ :/system/lib/hw/camera.qcom.so|libsonycamera.so \ -:/system/vendor/lib/libwvm.so|libdtcpipplayer.so \ " on early-fs diff --git a/shinano.mk b/shinano.mk index ed99081..aa7a8ad 100644 --- a/shinano.mk +++ b/shinano.mk @@ -54,7 +54,6 @@ PRODUCT_COPY_FILES += \ # Camera (stock .575 blobs) PRODUCT_PACKAGES += \ - libshims_wvm \ libshims_signal \ libshims_idd \ libsonycamera -- cgit v1.2.3