17 files changed, 78 insertions, 38 deletions
diff --git a/board-info.txt b/board-info.txt
index ceab7e3..678fc8c 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1,4 +1,4 @@
 require board=tuna
-require version-bootloader=PRIMEKJ01
+require version-bootloader=PRIMEKJ02
 require version-baseband=I9250XXKJ1
 
diff --git a/extract-files.sh b/extract-files.sh
index 97be0db..8c3e05f 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -20,12 +20,9 @@ DEVICE=maguro
 MANUFACTURER=samsung
 
 mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
-adb pull /system/etc/permissions/com.google.widevine.software.drm.xml ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/com.google.widevine.software.drm.xml
-adb pull /system/lib/drm/libdrmwvmplugin.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libdrmwvmplugin.so
+adb pull /system/bin/fRom ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/fRom
+chmod 755 ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/fRom
 adb pull /system/lib/libsecril-client.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libsecril-client.so
-adb pull /system/lib/libwvdrm_L3.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libwvdrm_L3.so
-adb pull /system/lib/libwvm.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libwvm.so
-adb pull /system/lib/libWVStreamControlAPI_L3.so ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/libWVStreamControlAPI_L3.so
 adb pull /system/vendor/bin/pvrsrvinit ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/pvrsrvinit
 chmod 755 ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/pvrsrvinit
 adb pull /system/vendor/etc/sirfgps.conf ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/sirfgps.conf
@@ -71,12 +68,8 @@ PRODUCT_COPY_FILES := \\
 
 # All the blobs necessary for maguro
 PRODUCT_COPY_FILES += \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/com.google.widevine.software.drm.xml:system/etc/permissions/com.google.widevine.software.drm.xml \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libdrmwvmplugin.so:system/lib/drm/libdrmwvmplugin.so \\
+    vendor/__MANUFACTURER__/__DEVICE__/proprietary/fRom:system/bin/fRom \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libsecril-client.so:system/lib/libsecril-client.so \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libwvdrm_L3.so:system/lib/libwvdrm_L3.so \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libwvm.so:system/lib/libwvm.so \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libWVStreamControlAPI_L3.so:system/lib/libWVStreamControlAPI_L3.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/pvrsrvinit:system/vendor/bin/pvrsrvinit \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/sirfgps.conf:system/vendor/etc/sirfgps.conf \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/bcm4330.hcd:system/vendor/firmware/bcm4330.hcd \\
diff --git a/full_maguro.mk b/full_maguro.mk
index 88497d7..a13c4bd 100644
--- a/full_maguro.mk
+++ b/full_maguro.mk
@@ -21,6 +21,9 @@
 # lines, full and maguro, hence its name.
 #
 
+# Get the long list of APNs
+PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
 # Camera
 PRODUCT_PACKAGES := \
     Camera
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..a937dff 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
 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 \
@@ -65,6 +71,7 @@ do
     ;;
   samsung)
     TO_EXTRACT="\
+            system/bin/fRom \
             system/lib/libsecril-client.so \
             system/vendor/lib/libsec-ril.so \
             "
@@ -80,7 +87,7 @@ do
   do
     echo \ \ \ \ Extracting $ONE_FILE
     unzip -j -o $ZIP $ONE_FILE -d $FILEDIR > /dev/null || echo \ \ \ \ Error extracting $ONE_FILE
-    if test $ONE_FILE = system/vendor/bin/gpsd -o $ONE_FILE = system/vendor/bin/pvrsrvinit
+    if test $ONE_FILE = system/vendor/bin/gpsd -o $ONE_FILE = system/vendor/bin/pvrsrvinit -o $ONE_FILE = system/bin/fRom
     then
       chmod a+x $FILEDIR/$(basename $ONE_FILE) || echo \ \ \ \ Error chmoding $ONE_FILE
     fi
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..b685549 100644
--- a/self-extractors/root/BoardConfigVendor.mk
+++ b/self-extractors/root/BoardConfigVendor.mk
@@ -17,6 +17,7 @@ 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)
diff --git a/self-extractors/root/device-vendor.mk b/self-extractors/root/device-vendor.mk
index 11a45cc..c266dda 100644
--- a/self-extractors/root/device-vendor.mk
+++ b/self-extractors/root/device-vendor.mk
@@ -17,6 +17,7 @@ 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))
diff --git a/self-extractors/samsung/staging/device-maguro.mk b/self-extractors/samsung/staging/device-maguro.mk
index f266776..718c496 100644
--- a/self-extractors/samsung/staging/device-maguro.mk
+++ b/self-extractors/samsung/staging/device-maguro.mk
@@ -14,7 +14,9 @@
 
 LOCAL_PATH := vendor/samsung/maguro
 
-# Samsung blobs necessary for Maguro hardware
+# Samsung blob(s) necessary for Maguro hardware
 PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/proprietary/fRom:system/bin/fRom \
     $(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/unzip-files.sh b/unzip-files.sh
index 90a969f..70c7576 100755
--- a/unzip-files.sh
+++ b/unzip-files.sh
@@ -20,12 +20,9 @@ DEVICE=maguro
 MANUFACTURER=samsung
 
 mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
-unzip -j -o ../../../${DEVICE}_update.zip system/etc/permissions/com.google.widevine.software.drm.xml -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
-unzip -j -o ../../../${DEVICE}_update.zip system/lib/drm/libdrmwvmplugin.so -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
+unzip -j -o ../../../${DEVICE}_update.zip system/bin/fRom -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
+chmod 755 ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/fRom
 unzip -j -o ../../../${DEVICE}_update.zip system/lib/libsecril-client.so -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
-unzip -j -o ../../../${DEVICE}_update.zip system/lib/libwvdrm_L3.so -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
-unzip -j -o ../../../${DEVICE}_update.zip system/lib/libwvm.so -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
-unzip -j -o ../../../${DEVICE}_update.zip system/lib/libWVStreamControlAPI_L3.so -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
 unzip -j -o ../../../${DEVICE}_update.zip system/vendor/bin/pvrsrvinit -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
 chmod 755 ../../../vendor/$MANUFACTURER/$DEVICE/proprietary/pvrsrvinit
 unzip -j -o ../../../${DEVICE}_update.zip system/vendor/etc/sirfgps.conf -d ../../../vendor/$MANUFACTURER/$DEVICE/proprietary
@@ -71,12 +68,8 @@ PRODUCT_COPY_FILES := \\
 
 # All the blobs necessary for maguro
 PRODUCT_COPY_FILES += \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/com.google.widevine.software.drm.xml:system/etc/permissions/com.google.widevine.software.drm.xml \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libdrmwvmplugin.so:system/lib/drm/libdrmwvmplugin.so \\
+    vendor/__MANUFACTURER__/__DEVICE__/proprietary/fRom:system/bin/fRom \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/libsecril-client.so:system/lib/libsecril-client.so \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libwvdrm_L3.so:system/lib/libwvdrm_L3.so \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libwvm.so:system/lib/libwvm.so \\
-    vendor/__MANUFACTURER__/__DEVICE__/proprietary/libWVStreamControlAPI_L3.so:system/lib/libWVStreamControlAPI_L3.so \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/pvrsrvinit:system/vendor/bin/pvrsrvinit \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/sirfgps.conf:system/vendor/etc/sirfgps.conf \\
     vendor/__MANUFACTURER__/__DEVICE__/proprietary/bcm4330.hcd:system/vendor/firmware/bcm4330.hcd \\