Update self-extractors

Change-Id: Ie9ea16caed65f8a6296e8a283bcaae074b51dbd4

7 files changed, 1 insertions, 51 deletions

diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index a65771d..3bdc515 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -23,7 +23,7 @@ ROOTDEVICE=maguro
 DEVICE=maguro
 MANUFACTURER=samsung
 
-for COMPANY in broadcom csr imgtec invensense nxp samsung ti widevine
+for COMPANY in broadcom csr imgtec invensense nxp samsung ti
 do
   echo Processing files from $COMPANY
   rm -rf tmp
@@ -80,15 +80,6 @@ do
             system/vendor/firmware/ducati-m3.bin \
             "
     ;;
-  widevine)
-    TO_EXTRACT="\
-            system/etc/permissions/com.google.widevine.software.drm.xml \
-            system/lib/drm/libdrmwvmplugin.so \
-            system/lib/libwvdrm_L3.so \
-            system/lib/libwvm.so \
-            system/lib/libWVStreamControlAPI_L3.so \
-            "
-    ;;
   esac
   echo \ \ Extracting files from OTA package
   for ONE_FILE in $TO_EXTRACT
diff --git a/self-extractors/root/BoardConfigVendor.mk b/self-extractors/root/BoardConfigVendor.mk
index f874dee..b685549 100644
--- a/self-extractors/root/BoardConfigVendor.mk
+++ b/self-extractors/root/BoardConfigVendor.mk
@@ -21,4 +21,3 @@ LOCAL_STEM := maguro/BoardConfigMaguro.mk
 -include vendor/nxp/$(LOCAL_STEM)
 -include vendor/samsung/$(LOCAL_STEM)
 -include vendor/ti/$(LOCAL_STEM)
--include vendor/widevine/$(LOCAL_STEM)
diff --git a/self-extractors/root/device-vendor.mk b/self-extractors/root/device-vendor.mk
index 8c9a030..c266dda 100644
--- a/self-extractors/root/device-vendor.mk
+++ b/self-extractors/root/device-vendor.mk
@@ -21,4 +21,3 @@ $(call inherit-product-if-exists, vendor/invensense/$(LOCAL_STEM))
 $(call inherit-product-if-exists, vendor/nxp/$(LOCAL_STEM))
 $(call inherit-product-if-exists, vendor/samsung/$(LOCAL_STEM))
 $(call inherit-product-if-exists, vendor/ti/$(LOCAL_STEM))
-$(call inherit-product-if-exists, vendor/widevine/$(LOCAL_STEM))
diff --git a/self-extractors/widevine/COPYRIGHT b/self-extractors/widevine/COPYRIGHT
deleted file mode 100644
index 91f97c9..0000000
--- a/self-extractors/widevine/COPYRIGHT
+++ /dev/null
@@ -1 +0,0 @@
-# (C) Widevine. All Rights Reserved.
diff --git a/self-extractors/widevine/LICENSE b/self-extractors/widevine/LICENSE
deleted file mode 100644
index f1d5315..0000000
--- a/self-extractors/widevine/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-WIDEVINE LICENSE GOES HERE
diff --git a/self-extractors/widevine/staging/BoardConfigMaguro.mk b/self-extractors/widevine/staging/BoardConfigMaguro.mk
deleted file mode 100644
index 01a0ff3..0000000
--- a/self-extractors/widevine/staging/BoardConfigMaguro.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2010 The Android Open Source 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.
diff --git a/self-extractors/widevine/staging/device-maguro.mk b/self-extractors/widevine/staging/device-maguro.mk
deleted file mode 100644
index 6bae789..0000000
--- a/self-extractors/widevine/staging/device-maguro.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2010 The Android Open Source 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 := vendor/widevine/maguro
-
-# Widevine blob(s) necessary for Maguro hardware
-PRODUCT_COPY_FILES := \
-    $(LOCAL_PATH)/proprietary/com.google.widevine.software.drm.xml:system/etc/permissions/com.google.widevine.software.drm.xml \
-    $(LOCAL_PATH)/proprietary/libdrmwvmplugin.so:system/lib/drm/libdrmwvmplugin.so \
-    $(LOCAL_PATH)/proprietary/libwvdrm_L3.so:system/lib/libwvdrm_L3.so \
-    $(LOCAL_PATH)/proprietary/libwvm.so:system/lib/libwvm.so \
-    $(LOCAL_PATH)/proprietary/libWVStreamControlAPI_L3.so:system/lib/libWVStreamControlAPI_L3.so \
-