From a10b335999eded8e0c11344919e8250296ed94b7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 16 Sep 2011 10:40:51 -0700 Subject: Update self-extractors Change-Id: I9cf9364922efe4d56e2d964753e8fa27e75ab21f --- self-extractors/generate-packages.sh | 11 +--------- self-extractors/root/BoardConfigVendor.mk | 1 - self-extractors/root/device-vendor.mk | 1 - self-extractors/widevine/COPYRIGHT | 1 - self-extractors/widevine/LICENSE | 1 - .../widevine/staging/BoardConfigCrespo.mk | 13 ------------ self-extractors/widevine/staging/device-crespo.mk | 24 ---------------------- 7 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 self-extractors/widevine/COPYRIGHT delete mode 100644 self-extractors/widevine/LICENSE delete mode 100644 self-extractors/widevine/staging/BoardConfigCrespo.mk delete mode 100644 self-extractors/widevine/staging/device-crespo.mk (limited to 'self-extractors') diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index 1a63d1c..cf72db1 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -34,7 +34,7 @@ ROOTDEVICE=crespo DEVICE=crespo MANUFACTURER=samsung -for COMPANY in akm broadcom cypress imgtec nxp samsung widevine +for COMPANY in akm broadcom cypress imgtec nxp samsung do echo Processing files from $COMPANY rm -rf tmp @@ -87,15 +87,6 @@ do system/vendor/lib/libsec-ril.so \ " ;; - 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 365996f..34558d9 100644 --- a/self-extractors/root/BoardConfigVendor.mk +++ b/self-extractors/root/BoardConfigVendor.mk @@ -20,4 +20,3 @@ LOCAL_STEM := crespo/BoardConfigCrespo.mk -include vendor/imgtec/$(LOCAL_STEM) -include vendor/nxp/$(LOCAL_STEM) -include vendor/samsung/$(LOCAL_STEM) --include vendor/widevine/$(LOCAL_STEM) diff --git a/self-extractors/root/device-vendor.mk b/self-extractors/root/device-vendor.mk index dcf6247..f941d11 100644 --- a/self-extractors/root/device-vendor.mk +++ b/self-extractors/root/device-vendor.mk @@ -20,4 +20,3 @@ $(call inherit-product-if-exists, vendor/cypress/$(LOCAL_STEM)) $(call inherit-product-if-exists, vendor/imgtec/$(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/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/BoardConfigCrespo.mk b/self-extractors/widevine/staging/BoardConfigCrespo.mk deleted file mode 100644 index 01a0ff3..0000000 --- a/self-extractors/widevine/staging/BoardConfigCrespo.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-crespo.mk b/self-extractors/widevine/staging/device-crespo.mk deleted file mode 100644 index 2d32797..0000000 --- a/self-extractors/widevine/staging/device-crespo.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/crespo - -# Widevine blobs necessary for Nexus S 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 \ - -- cgit v1.1