ferrari: Switch to bullhead WV

Change-Id: I6a225f120b0a8809a097273475b23fc813ad03e4

5 files changed, 7 insertions, 64 deletions

diff --git a/libshims/Android.mk b/libshims/Android.mk
deleted file mode 100644
index 013743f..0000000
--- a/libshims/Android.mk
+++ /dev/null
@@ -1,29 +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.
-
-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)
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/product/libshims.mk b/product/libshims.mk
deleted file mode 100644
index 3c391d2..0000000
--- a/product/libshims.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# DRM
-PRODUCT_PACKAGES += \
-    libshims_wvm
diff --git a/proprietary-files.txt b/proprietary-files.txt
index b4be06b..31737d3 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -375,9 +375,6 @@ etc/firmware/cpp_firmware_v1_2_0.fw
 etc/firmware/cpp_firmware_v1_4_0.fw
 
 # DRM - from kipper
-# libwvm.so - from seed
-# libdrmwvmplugin.so - from seed
-# libwvdrmengine.so - from seed
 bin/qseecomd|2423ad273f52311dbd2f3bb7e810734744e2e6ff
 lib/libdrmdecrypt.so|0cc6e6da79782fc4eeabc7c90d51dc5da7c12e7a
 vendor/lib64/libdrmfs.so|eb296e141d540b3ce53b79d1cf65365704914840
@@ -385,11 +382,6 @@ vendor/lib64/libdrmtime.so|7473d9ce55ffca308eef83d7c3b1562c3b7adbee
 vendor/lib64/libQSEEComAPI.so|20d5a7ee87a26330be174eeb57b1fbd6f5f1f1e6
 vendor/lib64/librpmb.so|3b997aa65fe0dfbdca73cf6b2fc881fb54b3bfa2
 vendor/lib64/libssd.so|b9b74375796f931355c54e99dc946a6f1d025b02
-vendor/lib/libwvdrm_L3.so|7e77482481197997294a834bfbc817a01b6075cd
-vendor/lib/libwvm.so|d143a34352073f16058c18debcf99c6a959dd5e1
-vendor/lib/libWVStreamControlAPI_L3.so|61673304827483d44b735a3dd08f0783d10ce92d
-vendor/lib/drm/libdrmwvmplugin.so|9f11ef67ea76ee95a43ed317a5cf479b9321d6d0
-vendor/lib/mediadrm/libwvdrmengine.so|70b94e8514f45c25a9a53f21186138a4026f4d67
 
 # GPS - from kipper
 -lib64/libloc_api_v02.so
@@ -542,3 +534,10 @@ lib64/libminui.so
 # FM
 bin/fm_qsoc_patches
 bin/ftmdaemon
+
+# WideVine - from bullhead
+vendor/lib/libwvdrm_L1.so|3eaf8ed1cb337608a1ccdb80d2c95804e7aea323
+vendor/lib/libwvm.so|59c4c078f4b897ddac8f665309b7a3f25522f207
+vendor/lib/libWVStreamControlAPI_L1.so|6b28492ac55b9a3d86993343cf2c8b55240b3420
+vendor/lib/drm/libdrmwvmplugin.so|3bee766222895f524421eb996ca6a08bcf95f19f
+vendor/lib/mediadrm/libwvdrmengine.so|6bdcc4d59b07ccbdd7b07a99677406ade3d2e232
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index a925e26..264db74 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -27,9 +27,6 @@
 #
 #
 
-on init
-    export LD_SHIM_LIBS /system/vendor/lib/libwvm.so|libshims_wvm.so
-
 on post-fs-data
     chown system system /dev/sysmatdrv
     chmod 0660 /dev/sysmatdrv