Updated scripts to generate maguro self-extractors

This adds invensense and widevine, and fine-tunes the
other ones for better consistency and ease of maintenance.

Bug: 4295425
Change-Id: Ia900c4350b02fb5c82454cf85dbc776465bda130

17 files changed, 115 insertions, 16 deletions

diff --git a/self-extractors/broadcom/staging/device-maguro.mk b/self-extractors/broadcom/staging/device-maguro.mk
index 2e8727d..414c0cf 100644
--- a/self-extractors/broadcom/staging/device-maguro.mk
+++ b/self-extractors/broadcom/staging/device-maguro.mk
@@ -14,6 +14,7 @@
 
 LOCAL_PATH := vendor/broadcom/maguro
 
-# Broadcom blob necessary for Maguro hardware
+# Broadcom blob(s) necessary for Maguro hardware
 PRODUCT_COPY_FILES := \
-    $(LOCAL_PATH)/proprietary/bcm4330.hcd:system/vendor/firmware/bcm4330.hcd
+    $(LOCAL_PATH)/proprietary/bcm4330.hcd:system/vendor/firmware/bcm4330.hcd \
+
diff --git a/self-extractors/csr/staging/device-maguro.mk b/self-extractors/csr/staging/device-maguro.mk
index adce4eb..de44d61 100644
--- a/self-extractors/csr/staging/device-maguro.mk
+++ b/self-extractors/csr/staging/device-maguro.mk
@@ -14,7 +14,8 @@
 
 LOCAL_PATH := vendor/csr/maguro
 
-# CSR blobs necessary for Maguro hardware
+# CSR blob(s) necessary for Maguro hardware
 PRODUCT_COPY_FILES := \
+    $(LOCAL_PATH)/proprietary/sirfgps.conf:system/vendor/etc/sirfgps.conf \
     $(LOCAL_PATH)/proprietary/gps.omap4.so:system/vendor/lib/hw/gps.omap4.so \
-    $(LOCAL_PATH)/proprietary/sirfgps.conf:system/vendor/etc/sirfgps.conf
+
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 15e9377..a65771d 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -16,13 +16,14 @@
 
 # 155376 = IRK28C
 # 156135 = IRK32
-ZIP=yakju-ota-156135.zip
-BUILD=irk32
+# 186921 = IRK77
+ZIP=yakju-ota-186921.zip
+BUILD=irk77
 ROOTDEVICE=maguro
 DEVICE=maguro
 MANUFACTURER=samsung
 
-for COMPANY in broadcom csr imgtec nxp samsung ti
+for COMPANY in broadcom csr imgtec invensense nxp samsung ti widevine
 do
   echo Processing files from $COMPANY
   rm -rf tmp
@@ -37,8 +38,8 @@ do
     ;;
   csr)
     TO_EXTRACT="\
-            system/vendor/lib/hw/gps.omap4.so \
             system/vendor/etc/sirfgps.conf \
+            system/vendor/lib/hw/gps.omap4.so \
             "
     ;;
   imgtec)
@@ -58,6 +59,11 @@ do
             system/vendor/lib/libusc.so \
             "
     ;;
+  invensense)
+    TO_EXTRACT="\
+            system/vendor/lib/libinvensense_mpl.so \
+            "
+    ;;
   nxp)
     TO_EXTRACT="\
             system/vendor/firmware/libpn544_fw.so \
@@ -74,6 +80,15 @@ 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/imgtec/staging/device-maguro.mk b/self-extractors/imgtec/staging/device-maguro.mk
index a9f2e85..36915cc 100644
--- a/self-extractors/imgtec/staging/device-maguro.mk
+++ b/self-extractors/imgtec/staging/device-maguro.mk
@@ -14,7 +14,7 @@
 
 LOCAL_PATH := vendor/imgtec/maguro
 
-# Imgtec blobs necessary for Maguro hardware
+# Imgtec blob(s) necessary for Maguro hardware
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/proprietary/pvrsrvinit:system/vendor/bin/pvrsrvinit \
     $(LOCAL_PATH)/proprietary/libEGL_POWERVR_SGX540_120.so:system/vendor/lib/egl/libEGL_POWERVR_SGX540_120.so \
@@ -28,4 +28,5 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/proprietary/libPVRScopeServices.so:system/vendor/lib/libPVRScopeServices.so \
     $(LOCAL_PATH)/proprietary/libsrv_init.so:system/vendor/lib/libsrv_init.so \
     $(LOCAL_PATH)/proprietary/libsrv_um.so:system/vendor/lib/libsrv_um.so \
-    $(LOCAL_PATH)/proprietary/libusc.so:system/vendor/lib/libusc.so
+    $(LOCAL_PATH)/proprietary/libusc.so:system/vendor/lib/libusc.so \
+
diff --git a/self-extractors/invensense/COPYRIGHT b/self-extractors/invensense/COPYRIGHT
new file mode 100644
index 0000000..38ff3f3
--- /dev/null
+++ b/self-extractors/invensense/COPYRIGHT
@@ -0,0 +1 @@
+# (C) Invensense. All Rights Reserved.
diff --git a/self-extractors/invensense/LICENSE b/self-extractors/invensense/LICENSE
new file mode 100644
index 0000000..9823b7a
--- /dev/null
+++ b/self-extractors/invensense/LICENSE
@@ -0,0 +1 @@
+INVENSENSE LICENSE GOES HERE
diff --git a/self-extractors/invensense/staging/BoardConfigMaguro.mk b/self-extractors/invensense/staging/BoardConfigMaguro.mk
new file mode 100644
index 0000000..01a0ff3
--- /dev/null
+++ b/self-extractors/invensense/staging/BoardConfigMaguro.mk
@@ -0,0 +1,13 @@
+# 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/invensense/staging/device-maguro.mk b/self-extractors/invensense/staging/device-maguro.mk
new file mode 100644
index 0000000..2b7afb0
--- /dev/null
+++ b/self-extractors/invensense/staging/device-maguro.mk
@@ -0,0 +1,20 @@
+# 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/invensense/maguro
+
+# Invensense blob(s) necessary for Maguro hardware
+PRODUCT_COPY_FILES := \
+    $(LOCAL_PATH)/proprietary/libinvensense_mpl.so:system/vendor/lib/libinvensense_mpl.so \
+
diff --git a/self-extractors/nxp/staging/device-maguro.mk b/self-extractors/nxp/staging/device-maguro.mk
index 1a29638..96ad6fc 100644
--- a/self-extractors/nxp/staging/device-maguro.mk
+++ b/self-extractors/nxp/staging/device-maguro.mk
@@ -14,6 +14,7 @@
 
 LOCAL_PATH := vendor/nxp/maguro
 
-# NXP blob necessary for Maguro hardware
+# NXP blob(s) necessary for Maguro hardware
 PRODUCT_COPY_FILES := \
-    $(LOCAL_PATH)/proprietary/libpn544_fw.so:system/vendor/firmware/libpn544_fw.so
+    $(LOCAL_PATH)/proprietary/libpn544_fw.so:system/vendor/firmware/libpn544_fw.so \
+
diff --git a/self-extractors/root/BoardConfigVendor.mk b/self-extractors/root/BoardConfigVendor.mk
index dd2354e..f874dee 100644
--- a/self-extractors/root/BoardConfigVendor.mk
+++ b/self-extractors/root/BoardConfigVendor.mk
@@ -17,6 +17,8 @@ LOCAL_STEM := maguro/BoardConfigMaguro.mk
 -include vendor/broadcom/$(LOCAL_STEM)
 -include vendor/csr/$(LOCAL_STEM)
 -include vendor/imgtec/$(LOCAL_STEM)
+-include vendor/invensense/$(LOCAL_STEM)
 -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 11a45cc..8c9a030 100644
--- a/self-extractors/root/device-vendor.mk
+++ b/self-extractors/root/device-vendor.mk
@@ -17,6 +17,8 @@ LOCAL_STEM := maguro/device-maguro.mk
 $(call inherit-product-if-exists, vendor/broadcom/$(LOCAL_STEM))
 $(call inherit-product-if-exists, vendor/csr/$(LOCAL_STEM))
 $(call inherit-product-if-exists, vendor/imgtec/$(LOCAL_STEM))
+$(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/samsung/staging/device-maguro.mk b/self-extractors/samsung/staging/device-maguro.mk
index f266776..dca99c6 100644
--- a/self-extractors/samsung/staging/device-maguro.mk
+++ b/self-extractors/samsung/staging/device-maguro.mk
@@ -14,7 +14,8 @@
 
 LOCAL_PATH := vendor/samsung/maguro
 
-# Samsung blobs necessary for Maguro hardware
+# Samsung blob(s) necessary for Maguro hardware
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/proprietary/libsecril-client.so:system/lib/libsecril-client.so \
-    $(LOCAL_PATH)/proprietary/libsec-ril.so:system/vendor/lib/libsec-ril.so
+    $(LOCAL_PATH)/proprietary/libsec-ril.so:system/vendor/lib/libsec-ril.so \
+
diff --git a/self-extractors/ti/staging/device-maguro.mk b/self-extractors/ti/staging/device-maguro.mk
index e14a8e3..6dc6a36 100644
--- a/self-extractors/ti/staging/device-maguro.mk
+++ b/self-extractors/ti/staging/device-maguro.mk
@@ -14,6 +14,7 @@
 
 LOCAL_PATH := vendor/ti/maguro
 
-# TI blob necessary for Maguro hardware
+# TI blob(s) necessary for Maguro hardware
 PRODUCT_COPY_FILES := \
-    $(LOCAL_PATH)/proprietary/ducati-m3.bin:system/vendor/firmware/ducati-m3.bin
+    $(LOCAL_PATH)/proprietary/ducati-m3.bin:system/vendor/firmware/ducati-m3.bin \
+
diff --git a/self-extractors/widevine/COPYRIGHT b/self-extractors/widevine/COPYRIGHT
new file mode 100644
index 0000000..91f97c9
--- /dev/null
+++ b/self-extractors/widevine/COPYRIGHT
@@ -0,0 +1 @@
+# (C) Widevine. All Rights Reserved.
diff --git a/self-extractors/widevine/LICENSE b/self-extractors/widevine/LICENSE
new file mode 100644
index 0000000..f1d5315
--- /dev/null
+++ b/self-extractors/widevine/LICENSE
@@ -0,0 +1 @@
+WIDEVINE LICENSE GOES HERE
diff --git a/self-extractors/widevine/staging/BoardConfigMaguro.mk b/self-extractors/widevine/staging/BoardConfigMaguro.mk
new file mode 100644
index 0000000..01a0ff3
--- /dev/null
+++ b/self-extractors/widevine/staging/BoardConfigMaguro.mk
@@ -0,0 +1,13 @@
+# 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
new file mode 100644
index 0000000..6bae789
--- /dev/null
+++ b/self-extractors/widevine/staging/device-maguro.mk
@@ -0,0 +1,24 @@
+# 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 \
+