summaryrefslogtreecommitdiffstats
path: root/self-extractors
diff options
context:
space:
mode:
Diffstat (limited to 'self-extractors')
-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
27 files changed, 433 insertions, 101 deletions
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 247c686..5a6a292 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -23,8 +23,10 @@
# 238649 = IML74G
# 239410 = IML74K
# 257829 = IMM30B
-ZIP=yakju-ota-257829.zip
-BUILD=imm30b
+# 241580 = IRL89
+# 241968 = IRM03
+ZIP=yakju-ota-241968.zip
+BUILD=irm03
ROOTDEVICE=maguro
DEVICE=maguro
MANUFACTURER=samsung
@@ -50,7 +52,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