summaryrefslogtreecommitdiffstats
path: root/self-extractors
diff options
context:
space:
mode:
Diffstat (limited to 'self-extractors')
-rw-r--r--self-extractors/broadcom/COPYRIGHT2
-rw-r--r--self-extractors/broadcom/LICENSE219
-rw-r--r--self-extractors/broadcom/staging/BoardConfigPartial.mk (renamed from self-extractors/broadcom/staging/BoardConfigMaguro.mk)0
-rw-r--r--self-extractors/broadcom/staging/device-partial.mk17
-rw-r--r--self-extractors/broadcom/staging/proprietary/Android.mk (renamed from self-extractors/nxp/staging/device-maguro.mk)19
-rw-r--r--self-extractors/csr/staging/BoardConfigPartial.mk (renamed from self-extractors/csr/staging/BoardConfigMaguro.mk)0
-rw-r--r--self-extractors/csr/staging/device-partial.mk18
-rw-r--r--self-extractors/csr/staging/proprietary/Android.mk39
-rwxr-xr-xself-extractors/generate-packages.sh8
-rw-r--r--self-extractors/imgtec/staging/BoardConfigPartial.mk (renamed from self-extractors/imgtec/staging/BoardConfigMaguro.mk)0
-rw-r--r--self-extractors/imgtec/staging/device-maguro.mk32
-rw-r--r--self-extractors/imgtec/staging/device-partial.mk (renamed from self-extractors/invensense/staging/device-maguro.mk)21
-rw-r--r--self-extractors/imgtec/staging/proprietary/Android.mk148
-rw-r--r--self-extractors/invensense/staging/BoardConfigPartial.mk (renamed from self-extractors/invensense/staging/BoardConfigMaguro.mk)0
-rw-r--r--self-extractors/invensense/staging/device-partial.mk17
-rw-r--r--self-extractors/invensense/staging/proprietary/Android.mk29
-rw-r--r--self-extractors/nxp/staging/BoardConfigPartial.mk (renamed from self-extractors/nxp/staging/BoardConfigMaguro.mk)0
-rw-r--r--self-extractors/nxp/staging/device-partial.mk17
-rw-r--r--self-extractors/nxp/staging/proprietary/Android.mk (renamed from self-extractors/csr/staging/device-maguro.mk)20
-rw-r--r--self-extractors/root/BoardConfigVendor.mk2
-rw-r--r--self-extractors/root/device-vendor.mk2
-rw-r--r--self-extractors/samsung/staging/BoardConfigPartial.mk (renamed from self-extractors/samsung/staging/BoardConfigMaguro.mk)0
-rw-r--r--self-extractors/samsung/staging/device-maguro.mk22
-rw-r--r--self-extractors/samsung/staging/device-partial.mk19
-rw-r--r--self-extractors/samsung/staging/proprietary/Android.mk48
-rw-r--r--self-extractors/ti/staging/BoardConfigPartial.mk (renamed from self-extractors/ti/staging/BoardConfigMaguro.mk)0
-rw-r--r--self-extractors/ti/staging/device-maguro.mk20
-rw-r--r--self-extractors/ti/staging/device-partial.mk17
-rw-r--r--self-extractors/ti/staging/proprietary/Android.mk (renamed from self-extractors/broadcom/staging/device-maguro.mk)19
29 files changed, 435 insertions, 320 deletions
diff --git a/self-extractors/broadcom/COPYRIGHT b/self-extractors/broadcom/COPYRIGHT
index bf44774..61c079d 100644
--- a/self-extractors/broadcom/COPYRIGHT
+++ b/self-extractors/broadcom/COPYRIGHT
@@ -1 +1 @@
-# (C) Broadcom Corporation
+# (C) Broadcom Corporation. All Rights Reserved.
diff --git a/self-extractors/broadcom/LICENSE b/self-extractors/broadcom/LICENSE
index 312dec7..95d4f4e 100644
--- a/self-extractors/broadcom/LICENSE
+++ b/self-extractors/broadcom/LICENSE
@@ -1,218 +1 @@
-THIS DEVELOPER SOFTWARE LICENSE AGREEMENT (THE "AGREEMENT") IS A LEGALLY
-BINDING AGREEMENT BETWEEN BROADCOM CORPORATION ("LICENSOR") AND
-YOU OR THE LEGAL ENTITY YOU REPRESENT ("You" or its possessive, "Your"). BY
-TYPING "I ACCEPT" WHERE INDICATED YOU ACKNOWLEDGE THAT YOU HAVE READ THIS
-AGREEMENT, UNDERSTAND IT AND AGREE TO BE BOUND BY ITS TERMS AND CONDITIONS. IF
-YOU DO NOT AGREE TO THESE TERMS YOU MUST DISCONTINUE THE INSTALLATION PROCESS
-AND YOU SHALL NOT USE THE SOFTWARE OR RETAIN ANY COPIES OF THE SOFTWARE OR
-DOCUMENTATION. ANY USE OR POSSESSION OF THE SOFTWARE BY YOU IS SUBJECT TO THE
-TERMS AND CONDITIONS SET FORTH IN THIS AGREEMENT. IF THE SOFTWARE IS INSTALLED
-ON A COMPUTER OWNED BY A CORPORATION OR OTHER LEGAL ENTITY, THEN YOU REPRESENT
-AND WARRANT THAT YOU HAVE THE AUTHORITY TO BIND SUCH ENTITY TO THE TERMS AND
-CONDITIONS OF THIS AGREEMENT.
-
- 1. Special Definitions
-
- a. The term "Android" means the open source mobile platform, software
- stack, operating system, middleware, application programming
- interfaces and mobile applications under the trade-name "Android"
- distributed at Android.com.
-
- b. The term "Android Applications" means a software application or
- open-source contribution developed by You, designed to operate with
- Android that does not contain or incorporate any of the Software.
-
- c. The term "Authorized Android Enabled Device" means the device
- identified on the site from which You downloaded the Software.
- The term "Software" means the Licensor's proprietary software and
- libraries in object code form, designed for use on the Authorized
- Android Enabled Device.
-
- d. The term "Authorized Android Enabled Device Software" means a
- packaged build for Authorized Android Enabled Devices, consisting of
- files suitable for installation on an Authorized Android Enabled
- Device using a mechanism such as fastboot mode or recovery mode.
-
- 2. License Grant
-
- a. Subject to the terms of this Agreement, Licensor hereby grants to
- You, free of charge, a non-exclusive, non-sublicensable,
- non-transferable, limited license, during the term of this Agreement,
- to download, install and use the Software internally in
- machine-readable (i.e., object code) form and the Documentation for
- non-commercial use on an Authorized Android Enabled Device and
- non-commercial redistribution of the Authorized Android Enabled
- Device Software (the "Limited Purpose"). You may grant your end users
- the right to use the Software for the Limited Purpose. The license to
- the Software granted to You hereunder is solely for the Limited
- Purpose set forth in this section, and the Software shall not be used
- for any other purpose.
-
- 3. Restrictions
-
- a. Retention of Rights. The entire right, title and interest in the
- Software shall remain with Licensor and, unless specified in writing
- hereunder, no rights are granted to any of the Software. Except for
- the right to use the Software for the Limited Purpose, the delivery
- of the Software to You does not convey to You any intellectual
- property rights in the Software, including, but not limited to any
- rights under any patent, trademark, copyright, or trade secret.
- Neither the delivery of the Software to You nor any terms set forth
- herein shall be construed to grant to You, either expressly, by
- implication or by way of estoppel, any license under any patents or
- other intellectual property rights covering or relating to any other
- product or invention or any combination of the Software with any
- other product. Any rights not expressly granted to You herein are
- reserved by Licensor.
-
- b. No Commercialization or Distribution of the Software and
- Documentation. Except as expressly provided in Section 2 of this
- Agreement, You shall have no right to (i) copy, disclose, distribute,
- publically perform, publically display, transfer, alter, modify,
- translate, disassemble, decompile, reverse engineer, or adapt the
- Software and Documentation, or any portion thereof, or create any
- derivative works based thereon; (ii) rent, lease, assign, sublicense,
- resell, disclose or otherwise transfer the Software and Documentation
- in whole or in part to any third party (iii) use the Software and
- Documentation except for the Limited Purpose, (iv) remove or alter
- any of the copyright or proprietary notices contained in any of the
- Software and Documentation. For the purposes of clarity, nothing in
- this Agreement prohibits You from making and distributing Android
- Applications under commercial or non-commercial terms, provided that
- You shall not contain, incorporate, and/or compile the Software or
- any of its derivative works, in whole or in part, into Your Android
- Applications and/or any software/devices created by You or by third
- parties acting on Your behalf. You and any such third party shall
- comply with all of the terms and conditions of this Agreement.
-
- c. No Reverse Engineering. Except for any portions of the Software
- provided to You in source code format and except for any third party
- code distributed with the Software that is licensed under contrary
- terms, You will not reverse engineer, disassemble,
- decompile, or translate the Software, or otherwise attempt to derive
- the source code version of the Software, except if and to the extent
- expressly permitted under any applicable law.
-
- d. Third Party Software. You agree that Android may contain third party
- software. You agree that you may not distribute such third party
- software for any purpose without appropriate licenses from the
- applicable third party or parties.
-
- e. No Transfer or Assignment. You shall not assign any of its rights or
- obligations under this Agreement. Any attempted assignment in
- contravention of this Section shall be void.
-
- 4. Indemnity
-
- a. You agree to indemnify and hold harmless Licensor and its officers,
- directors, customers, employees and successors and assigns (each an
- "Indemnified Party") against any and all claims, demands, causes of
- action, losses, liabilities, damages, costs and expenses, incurred by
- the Indemnified Party (including but not limited to costs of defense,
- investigation and reasonable attorney's fees) arising out of,
- resulting from or related to (i) any software, products,
- documentation, content, materials or derivative works created or
- developed by You using the Software which causes an infringement of
- any patent, copyright, trademark, trade secret, or other property,
- publicity or privacy rights of any third parties arising in any
- jurisdiction anywhere in the world, (ii) the download, distribution,
- installation, storage, execution, use or transfer of such software,
- products, documentation, content, materials or derivative works by
- any person or entity, and/or (iii) any breach of this Agreement by
- You. If requested by an Indemnified Party, You agree to defend such
- Indemnified Party in connection with any third party claims, demands,
- or causes of action resulting from, arising out of or in connection
- with any of the foregoing.
-
- 5. Limitation of Liability
-
- a. TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE LAWS, UNDER NO
- CIRCUMSTANCES, INCLUDING WITHOUT LIMITATION NEGLIGENCE, SHALL
- LICENSOR, ITS AFFILIATES AND/OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR
- AGENTS BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR
- CONSEQUENTIAL DAMAGES (INCLUDING BUT NOT LIMITED TO DAMAGES FOR LOSS
- OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS
- INFORMATION AND THE LIKE) ARISING OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR ANY DOWNLOAD, INSTALLATION OR USE OF, OR INABILITY TO
- USE, THE SOFTWARE, EVEN IF LICENSOR HAS BEEN ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE
- LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL
- DAMAGES SO THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY OR MAY BE
- LIMITED. IN NO EVENT SHALL LICENSOR'S TOTAL AGGREGATE LIABILITY TO
- YOU FOR ANY AND ALL DAMAGES, LOSSES, CLAIMS AND CAUSES OF ACTIONS
- (WHETHER IN CONTRACT, TORT, INCLUDING NEGLIGENCE, INDEMNIFICATION OR
- OTHERWISE) EXCEED ONE HUNDRED U.S. DOLLARS (US$100). THE LIMITATIONS
- SET FORTH IN THIS PARAGRAPH SHALL BE DEEMED TO APPLY TO THE MAXIMUM
- EXTENT PERMITTED BY APPLICABLE LAW. THE PARTIES HAVE FULLY CONSIDERED
- THE FOREGOING ALLOCATION OF RISK AND FIND IT REASONABLE, AND THAT THE
- FOREGOING LIMITATIONS IN THIS PARAGRAPH ARE AN ESSENTIAL BASIS OF
- THE BARGAIN BETWEEN THE PARTIES.
-
- 6. No Warranty
-
- a. LICENSOR MAKES NO WARRANTIES, EXPRESS OR IMPLIED, WITH RESPECT TO THE
- SOFTWARE AND DOCUMENTATION PROVIDED UNDER THIS AGREEMENT, INCLUDING
- BUT NOT LIMITED TO ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A
- PARTICULAR PURPOSE OR AGAINST INFRINGEMENT, OR ANY EXPRESS OR IMPLIED
- WARRANTY ARISING OUT OF TRADE USAGE OR OUT OF A COURSE OF DEALING OR
- COURSE OF PERFORMANCE. NOTHING CONTAINED IN THIS AGREEMENT SHALL BE
- CONSTRUED AS A WARRANTY OR REPRESENTATION BY LICENSOR (I) AS TO THE
- VALIDITY OR SCOPE OF ANY PATENT, COPYRIGHT OR OTHER INTELLECTUAL
- PROPERTY RIGHT AND (II) THAT ANY MANUFACTURE OR USE WILL BE FREE FROM
- INFRINGEMENT OF PATENTS, COPYRIGHTS OR OTHER INTELLECTUAL PROPERTY
- RIGHTS OF OTHERS, AND IT SHALL BE THE SOLE RESPONSIBILITY OF YOU TO
- MAKE SUCH DETERMINATION AS IS NECESSARY WITH RESPECT TO THE
- ACQUISITION OF LICENSES UNDER PATENTS AND OTHER INTELLECTUAL PROPERTY
- OF THIRD PARTIES. LICENSOR SHALL NOT HAVE ANY OBLIGATION TO PROVIDE
- ANY TECHNICAL SUPPORT OF THE SOFTWARE UNDER THIS AGREEMENT.
-
- 7. Term and Termination
-
- a. This Agreement shall be effective on the date You accept this
- Agreement and shall remain in effect until terminated as provided
- herein. You may terminate the Agreement at any time by deleting and
- destroying all copies of the Software and all related information in
- Your possession or control. This Agreement terminates immediately and
- automatically, with or without notice, if You fail to comply with any
- provision hereof. Additionally, Licensor may at any time terminate
- this Agreement, without cause, upon notice to You. Upon termination
- You must delete or destroy all copies of the Software in Your
- possession, and the license granted to You in this Agreement shall
- terminate. Sections 3, 4, 5, 6 and 8 shall survive the termination of
- this Agreement.
-
- 8. Miscellaneous
-
- a. Governing Law. This Agreement is governed and interpreted in
- accordance with the laws of the State of California without giving
- effect to its conflict of laws provisions. The United Nations
- Convention on Contracts for the International Sale of Goods is
- expressly disclaimed and shall not apply. Any claim arising out of or
- related to this Agreement must be brought exclusively in a federal or
- state court located in Santa Clara County, California and You consent
- to the jurisdiction and venue of such courts.
-
- b. Waiver and Severability. The failure of either party to require
- performance by the other party of any provision of this Agreement
- shall not affect the full right to require such performance at any
- time thereafter; nor shall the waiver by either party of a breach of
- any provision of this Agreement be taken or held to be a waiver of
- the provision itself. Severability. If any provision of this
- Agreement is unenforceable or invalid under any applicable law or is
- so held by applicable court decision, such unenforceability or
- invalidity shall not render this Agreement unenforceable or invalid
- as a whole, and such provision shall be changed and interpreted so as
- to best accomplish the objectives of such unenforceable or invalid
- provision within the limits of applicable law or applicable court
- decisions.
-
- c. Amendment and Modification. This Agreement and any of its terms and
- provisions may only be amended, modified, supplemented or waived in a
- writing signed by both parties hereto.
-
- d. Compliance with Laws. You shall comply with all applicable laws,
- rules, and regulations in connection with its activities under this
- Agreement.
-
- e. Entire Agreement. This Agreement completely and exclusively states
- the agreement between You and Licensor regarding this subject matter.
+BROADCOM LICENSE GOES HERE
diff --git a/self-extractors/broadcom/staging/BoardConfigMaguro.mk b/self-extractors/broadcom/staging/BoardConfigPartial.mk
index 01a0ff3..01a0ff3 100644
--- a/self-extractors/broadcom/staging/BoardConfigMaguro.mk
+++ b/self-extractors/broadcom/staging/BoardConfigPartial.mk
diff --git a/self-extractors/broadcom/staging/device-partial.mk b/self-extractors/broadcom/staging/device-partial.mk
new file mode 100644
index 0000000..118c94a
--- /dev/null
+++ b/self-extractors/broadcom/staging/device-partial.mk
@@ -0,0 +1,17 @@
+# 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.
+
+# Broadcom blob(s) necessary for Maguro hardware
+PRODUCT_PACKAGES := \
+ bcm4330
diff --git a/self-extractors/nxp/staging/device-maguro.mk b/self-extractors/broadcom/staging/proprietary/Android.mk
index 96ad6fc..888c48f 100644
--- a/self-extractors/nxp/staging/device-maguro.mk
+++ b/self-extractors/broadcom/staging/proprietary/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 The Android Open Source Project
+# Copyright (C) 2011 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.
@@ -12,9 +12,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-LOCAL_PATH := vendor/nxp/maguro
+LOCAL_PATH := $(call my-dir)
-# NXP blob(s) necessary for Maguro hardware
-PRODUCT_COPY_FILES := \
- $(LOCAL_PATH)/proprietary/libpn544_fw.so:system/vendor/firmware/libpn544_fw.so \
+ifeq ($(TARGET_DEVICE),maguro)
+include $(CLEAR_VARS)
+LOCAL_MODULE := bcm4330
+LOCAL_MODULE_OWNER := broadcom
+LOCAL_SRC_FILES := bcm4330.hcd
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .hcd
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
+include $(BUILD_PREBUILT)
+
+endif
diff --git a/self-extractors/csr/staging/BoardConfigMaguro.mk b/self-extractors/csr/staging/BoardConfigPartial.mk
index 01a0ff3..01a0ff3 100644
--- a/self-extractors/csr/staging/BoardConfigMaguro.mk
+++ b/self-extractors/csr/staging/BoardConfigPartial.mk
diff --git a/self-extractors/csr/staging/device-partial.mk b/self-extractors/csr/staging/device-partial.mk
new file mode 100644
index 0000000..82da534
--- /dev/null
+++ b/self-extractors/csr/staging/device-partial.mk
@@ -0,0 +1,18 @@
+# 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.
+
+# CSR blob(s) necessary for Maguro hardware
+PRODUCT_PACKAGES := \
+ sirfgps \
+ gps.omap4
diff --git a/self-extractors/csr/staging/proprietary/Android.mk b/self-extractors/csr/staging/proprietary/Android.mk
new file mode 100644
index 0000000..8083553
--- /dev/null
+++ b/self-extractors/csr/staging/proprietary/Android.mk
@@ -0,0 +1,39 @@
+# Copyright (C) 2011 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 := $(call my-dir)
+
+ifeq ($(TARGET_DEVICE),maguro)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := gps.omap4
+LOCAL_MODULE_OWNER := csr
+LOCAL_SRC_FILES := gps.omap4.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/hw
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := sirfgps
+LOCAL_MODULE_OWNER := csr
+LOCAL_SRC_FILES := sirfgps.conf
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .conf
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc
+include $(BUILD_PREBUILT)
+
+endif
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 4c30dec..fd8a7e2 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -25,8 +25,10 @@
# 257829 = IMM30B
# 262866 = IMM30D
# 299849 = IMM76D
-ZIP=yakju-ota-299849.zip
-BUILD=imm76d
+# 241580 = IRL89
+# 241968 = IRM03
+ZIP=yakju-ota-241968.zip
+BUILD=irm03
ROOTDEVICE=maguro
DEVICE=maguro
MANUFACTURER=samsung
@@ -52,7 +54,7 @@ do
;;
imgtec)
TO_EXTRACT="\
- system/vendor/bin/pvrsrvinit \
+ system/vendor/bin/pvrsrvctl \
system/vendor/lib/egl/libEGL_POWERVR_SGX540_120.so \
system/vendor/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so \
system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so \
diff --git a/self-extractors/imgtec/staging/BoardConfigMaguro.mk b/self-extractors/imgtec/staging/BoardConfigPartial.mk
index 01a0ff3..01a0ff3 100644
--- a/self-extractors/imgtec/staging/BoardConfigMaguro.mk
+++ b/self-extractors/imgtec/staging/BoardConfigPartial.mk
diff --git a/self-extractors/imgtec/staging/device-maguro.mk b/self-extractors/imgtec/staging/device-maguro.mk
deleted file mode 100644
index 36915cc..0000000
--- a/self-extractors/imgtec/staging/device-maguro.mk
+++ /dev/null
@@ -1,32 +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/imgtec/maguro
-
-# 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 \
- $(LOCAL_PATH)/proprietary/libGLESv1_CM_POWERVR_SGX540_120.so:system/vendor/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so \
- $(LOCAL_PATH)/proprietary/libGLESv2_POWERVR_SGX540_120.so:system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so \
- $(LOCAL_PATH)/proprietary/gralloc.omap4.so:system/vendor/lib/hw/gralloc.omap4.so \
- $(LOCAL_PATH)/proprietary/libglslcompiler.so:system/vendor/lib/libglslcompiler.so \
- $(LOCAL_PATH)/proprietary/libIMGegl.so:system/vendor/lib/libIMGegl.so \
- $(LOCAL_PATH)/proprietary/libpvr2d.so:system/vendor/lib/libpvr2d.so \
- $(LOCAL_PATH)/proprietary/libpvrANDROID_WSEGL.so:system/vendor/lib/libpvrANDROID_WSEGL.so \
- $(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 \
-
diff --git a/self-extractors/invensense/staging/device-maguro.mk b/self-extractors/imgtec/staging/device-partial.mk
index 2b7afb0..5dfa0b9 100644
--- a/self-extractors/invensense/staging/device-maguro.mk
+++ b/self-extractors/imgtec/staging/device-partial.mk
@@ -12,9 +12,18 @@
# 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 \
-
+# Imgtec blob(s) necessary for Maguro hardware
+PRODUCT_PACKAGES := \
+ pvrsrvctl \
+ libEGL_POWERVR_SGX540_120 \
+ libGLESv1_CM_POWERVR_SGX540_120 \
+ libGLESv2_POWERVR_SGX540_120 \
+ gralloc.omap4 \
+ libglslcompiler \
+ libIMGegl \
+ libpvr2d \
+ libpvrANDROID_WSEGL \
+ libPVRScopeServices \
+ libsrv_init \
+ libsrv_um \
+ libusc
diff --git a/self-extractors/imgtec/staging/proprietary/Android.mk b/self-extractors/imgtec/staging/proprietary/Android.mk
new file mode 100644
index 0000000..2d69bf3
--- /dev/null
+++ b/self-extractors/imgtec/staging/proprietary/Android.mk
@@ -0,0 +1,148 @@
+# Copyright (C) 2011 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 := $(call my-dir)
+
+ifeq ($(TARGET_DEVICE),maguro)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := pvrsrvctl
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := pvrsrvctl
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libEGL_POWERVR_SGX540_120
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := libEGL_POWERVR_SGX540_120.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libGLESv1_CM_POWERVR_SGX540_120
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := libGLESv1_CM_POWERVR_SGX540_120.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libGLESv2_POWERVR_SGX540_120
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := libGLESv2_POWERVR_SGX540_120.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/egl
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := gralloc.omap4
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := gralloc.omap4.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib/hw
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libglslcompiler
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := libglslcompiler.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libIMGegl
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := libIMGegl.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libpvr2d
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := libpvr2d.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libpvrANDROID_WSEGL
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := libpvrANDROID_WSEGL.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libPVRScopeServices
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := libPVRScopeServices.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libsrv_init
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := libsrv_init.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libsrv_um
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := libsrv_um.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libusc
+LOCAL_MODULE_OWNER := imgtec
+LOCAL_SRC_FILES := libusc.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
+include $(BUILD_PREBUILT)
+
+endif
diff --git a/self-extractors/invensense/staging/BoardConfigMaguro.mk b/self-extractors/invensense/staging/BoardConfigPartial.mk
index 01a0ff3..01a0ff3 100644
--- a/self-extractors/invensense/staging/BoardConfigMaguro.mk
+++ b/self-extractors/invensense/staging/BoardConfigPartial.mk
diff --git a/self-extractors/invensense/staging/device-partial.mk b/self-extractors/invensense/staging/device-partial.mk
new file mode 100644
index 0000000..81986a3
--- /dev/null
+++ b/self-extractors/invensense/staging/device-partial.mk
@@ -0,0 +1,17 @@
+# 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.
+
+# Invensense blob(s) necessary for Maguro hardware
+PRODUCT_PACKAGES := \
+ libinvensense_mpl
diff --git a/self-extractors/invensense/staging/proprietary/Android.mk b/self-extractors/invensense/staging/proprietary/Android.mk
new file mode 100644
index 0000000..df7bfb2
--- /dev/null
+++ b/self-extractors/invensense/staging/proprietary/Android.mk
@@ -0,0 +1,29 @@
+# Copyright (C) 2011 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 := $(call my-dir)
+
+ifeq ($(TARGET_DEVICE),maguro)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libinvensense_mpl
+LOCAL_MODULE_OWNER := invensense
+LOCAL_SRC_FILES := libinvensense_mpl.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/lib
+include $(BUILD_PREBUILT)
+
+endif
diff --git a/self-extractors/nxp/staging/BoardConfigMaguro.mk b/self-extractors/nxp/staging/BoardConfigPartial.mk
index 01a0ff3..01a0ff3 100644
--- a/self-extractors/nxp/staging/BoardConfigMaguro.mk
+++ b/self-extractors/nxp/staging/BoardConfigPartial.mk
diff --git a/self-extractors/nxp/staging/device-partial.mk b/self-extractors/nxp/staging/device-partial.mk
new file mode 100644
index 0000000..94593f2
--- /dev/null
+++ b/self-extractors/nxp/staging/device-partial.mk
@@ -0,0 +1,17 @@
+# 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.
+
+# NXP blob(s) necessary for Maguro hardware
+PRODUCT_PACKAGES := \
+ libpn544_fw
diff --git a/self-extractors/csr/staging/device-maguro.mk b/self-extractors/nxp/staging/proprietary/Android.mk
index de44d61..352c466 100644
--- a/self-extractors/csr/staging/device-maguro.mk
+++ b/self-extractors/nxp/staging/proprietary/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 The Android Open Source Project
+# Copyright (C) 2011 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.
@@ -12,10 +12,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-LOCAL_PATH := vendor/csr/maguro
+LOCAL_PATH := $(call my-dir)
-# 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 \
+ifeq ($(TARGET_DEVICE),maguro)
+include $(CLEAR_VARS)
+LOCAL_MODULE := libpn544_fw
+LOCAL_MODULE_OWNER := nxp
+LOCAL_SRC_FILES := libpn544_fw.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
+include $(BUILD_PREBUILT)
+
+endif
diff --git a/self-extractors/root/BoardConfigVendor.mk b/self-extractors/root/BoardConfigVendor.mk
index b685549..ca10d74 100644
--- a/self-extractors/root/BoardConfigVendor.mk
+++ b/self-extractors/root/BoardConfigVendor.mk
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-LOCAL_STEM := maguro/BoardConfigMaguro.mk
+LOCAL_STEM := maguro/BoardConfigPartial.mk
-include vendor/broadcom/$(LOCAL_STEM)
-include vendor/csr/$(LOCAL_STEM)
diff --git a/self-extractors/root/device-vendor.mk b/self-extractors/root/device-vendor.mk
index c266dda..833cbcd 100644
--- a/self-extractors/root/device-vendor.mk
+++ b/self-extractors/root/device-vendor.mk
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-LOCAL_STEM := maguro/device-maguro.mk
+LOCAL_STEM := maguro/device-partial.mk
$(call inherit-product-if-exists, vendor/broadcom/$(LOCAL_STEM))
$(call inherit-product-if-exists, vendor/csr/$(LOCAL_STEM))
diff --git a/self-extractors/samsung/staging/BoardConfigMaguro.mk b/self-extractors/samsung/staging/BoardConfigPartial.mk
index 01a0ff3..01a0ff3 100644
--- a/self-extractors/samsung/staging/BoardConfigMaguro.mk
+++ b/self-extractors/samsung/staging/BoardConfigPartial.mk
diff --git a/self-extractors/samsung/staging/device-maguro.mk b/self-extractors/samsung/staging/device-maguro.mk
deleted file mode 100644
index 718c496..0000000
--- a/self-extractors/samsung/staging/device-maguro.mk
+++ /dev/null
@@ -1,22 +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/samsung/maguro
-
-# 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 \
-
diff --git a/self-extractors/samsung/staging/device-partial.mk b/self-extractors/samsung/staging/device-partial.mk
new file mode 100644
index 0000000..3f1b7f5
--- /dev/null
+++ b/self-extractors/samsung/staging/device-partial.mk
@@ -0,0 +1,19 @@
+# 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.
+
+# Samsung blob(s) necessary for Maguro hardware
+PRODUCT_PACKAGES := \
+ fRom \
+ libsec-ril \
+ libsecril-client
diff --git a/self-extractors/samsung/staging/proprietary/Android.mk b/self-extractors/samsung/staging/proprietary/Android.mk
new file mode 100644
index 0000000..cd34265
--- /dev/null
+++ b/self-extractors/samsung/staging/proprietary/Android.mk
@@ -0,0 +1,48 @@
+# Copyright (C) 2011 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 := $(call my-dir)
+
+ifeq ($(TARGET_DEVICE),maguro)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fRom
+LOCAL_MODULE_OWNER := samsung
+LOCAL_SRC_FILES := fRom
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libsec-ril
+LOCAL_MODULE_OWNER := samsung
+LOCAL_SRC_FILES := libsec-ril.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libsecril-client
+LOCAL_MODULE_OWNER := samsung
+LOCAL_SRC_FILES := libsecril-client.so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH := $(TARGET_OUT)/lib
+include $(BUILD_PREBUILT)
+
+endif
diff --git a/self-extractors/ti/staging/BoardConfigMaguro.mk b/self-extractors/ti/staging/BoardConfigPartial.mk
index 01a0ff3..01a0ff3 100644
--- a/self-extractors/ti/staging/BoardConfigMaguro.mk
+++ b/self-extractors/ti/staging/BoardConfigPartial.mk
diff --git a/self-extractors/ti/staging/device-maguro.mk b/self-extractors/ti/staging/device-maguro.mk
deleted file mode 100644
index 6dc6a36..0000000
--- a/self-extractors/ti/staging/device-maguro.mk
+++ /dev/null
@@ -1,20 +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/ti/maguro
-
-# TI blob(s) necessary for Maguro hardware
-PRODUCT_COPY_FILES := \
- $(LOCAL_PATH)/proprietary/ducati-m3.bin:system/vendor/firmware/ducati-m3.bin \
-
diff --git a/self-extractors/ti/staging/device-partial.mk b/self-extractors/ti/staging/device-partial.mk
new file mode 100644
index 0000000..427009b
--- /dev/null
+++ b/self-extractors/ti/staging/device-partial.mk
@@ -0,0 +1,17 @@
+# 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.
+
+# TI blob(s) necessary for Maguro hardware
+PRODUCT_PACKAGES := \
+ ducati-m3
diff --git a/self-extractors/broadcom/staging/device-maguro.mk b/self-extractors/ti/staging/proprietary/Android.mk
index 414c0cf..baf9aaa 100644
--- a/self-extractors/broadcom/staging/device-maguro.mk
+++ b/self-extractors/ti/staging/proprietary/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 The Android Open Source Project
+# Copyright (C) 2011 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.
@@ -12,9 +12,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-LOCAL_PATH := vendor/broadcom/maguro
+LOCAL_PATH := $(call my-dir)
-# Broadcom blob(s) necessary for Maguro hardware
-PRODUCT_COPY_FILES := \
- $(LOCAL_PATH)/proprietary/bcm4330.hcd:system/vendor/firmware/bcm4330.hcd \
+ifeq ($(TARGET_DEVICE),maguro)
+include $(CLEAR_VARS)
+LOCAL_MODULE := ducati-m3
+LOCAL_MODULE_OWNER := ti
+LOCAL_SRC_FILES := ducati-m3.bin
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .bin
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
+include $(BUILD_PREBUILT)
+
+endif