diff options
| -rw-r--r-- | self-extractors/akm/staging/device-crespo.mk | 6 | ||||
| -rw-r--r-- | self-extractors/broadcom/staging/device-crespo.mk | 10 | ||||
| -rw-r--r-- | self-extractors/cypress/staging/device-crespo.mk | 6 | ||||
| -rw-r--r-- | self-extractors/imgtec/staging/device-crespo.mk | 30 | ||||
| -rw-r--r-- | self-extractors/nxp/staging/device-crespo.mk | 6 | ||||
| -rw-r--r-- | self-extractors/root/BoardConfigVendor.mk | 14 | ||||
| -rw-r--r-- | self-extractors/root/device-vendor.mk | 14 | ||||
| -rw-r--r-- | self-extractors/samsung/staging/device-crespo.mk | 10 |
8 files changed, 56 insertions, 40 deletions
diff --git a/self-extractors/akm/staging/device-crespo.mk b/self-extractors/akm/staging/device-crespo.mk index bb28e2b..21bcbfa 100644 --- a/self-extractors/akm/staging/device-crespo.mk +++ b/self-extractors/akm/staging/device-crespo.mk @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# AKM blob necessary for crespo +LOCAL_PATH := vendor/akm/crespo + +# AKM blob necessary for Nexus S hardware PRODUCT_COPY_FILES := \ - vendor/akm/crespo/proprietary/libakm.so:system/vendor/lib/libakm.so + $(LOCAL_PATH)/proprietary/libakm.so:system/vendor/lib/libakm.so diff --git a/self-extractors/broadcom/staging/device-crespo.mk b/self-extractors/broadcom/staging/device-crespo.mk index d1d1ad1..a31bedb 100644 --- a/self-extractors/broadcom/staging/device-crespo.mk +++ b/self-extractors/broadcom/staging/device-crespo.mk @@ -12,8 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Broadcom blobs necessary for crespo +LOCAL_PATH := vendor/broadcom/crespo + +# Broadcom blobs necessary for Nexus S hardware PRODUCT_COPY_FILES := \ - vendor/broadcom/crespo/proprietary/gpsd:system/vendor/bin/gpsd \ - vendor/broadcom/crespo/proprietary/bcm4329.hcd:system/vendor/firmware/bcm4329.hcd \ - vendor/broadcom/crespo/proprietary/gps.s5pc110.so:system/vendor/lib/hw/gps.s5pc110.so + $(LOCAL_PATH)/proprietary/gpsd:system/vendor/bin/gpsd \ + $(LOCAL_PATH)/proprietary/bcm4329.hcd:system/vendor/firmware/bcm4329.hcd \ + $(LOCAL_PATH)/proprietary/gps.s5pc110.so:system/vendor/lib/hw/gps.s5pc110.so diff --git a/self-extractors/cypress/staging/device-crespo.mk b/self-extractors/cypress/staging/device-crespo.mk index 071ef08..9d51f96 100644 --- a/self-extractors/cypress/staging/device-crespo.mk +++ b/self-extractors/cypress/staging/device-crespo.mk @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# cypress blob necessary for crespo +LOCAL_PATH := vendor/cypress/crespo + +# cypress blob necessary for Nexus S hardware PRODUCT_COPY_FILES := \ - vendor/cypress/crespo/proprietary/cypress-touchkey.bin:system/vendor/firmware/cypress-touchkey.bin + $(LOCAL_PATH)/proprietary/cypress-touchkey.bin:system/vendor/firmware/cypress-touchkey.bin diff --git a/self-extractors/imgtec/staging/device-crespo.mk b/self-extractors/imgtec/staging/device-crespo.mk index 118a64a..a79deaf 100644 --- a/self-extractors/imgtec/staging/device-crespo.mk +++ b/self-extractors/imgtec/staging/device-crespo.mk @@ -12,18 +12,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Imgtec blobs necessary for crespo +LOCAL_PATH := vendor/imgtec/crespo + +# Imgtec blobs necessary for Nexus S hardware PRODUCT_COPY_FILES += \ - vendor/imgtec/crespo/proprietary/pvrsrvinit:system/vendor/bin/pvrsrvinit \ - vendor/imgtec/crespo/proprietary/libEGL_POWERVR_SGX540_120.so:system/vendor/lib/egl/libEGL_POWERVR_SGX540_120.so \ - vendor/imgtec/crespo/proprietary/libGLESv1_CM_POWERVR_SGX540_120.so:system/vendor/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so \ - vendor/imgtec/crespo/proprietary/libGLESv2_POWERVR_SGX540_120.so:system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so \ - vendor/imgtec/crespo/proprietary/gralloc.s5pc110.so:system/vendor/lib/hw/gralloc.s5pc110.so \ - vendor/imgtec/crespo/proprietary/libglslcompiler.so:system/vendor/lib/libglslcompiler.so \ - vendor/imgtec/crespo/proprietary/libIMGegl.so:system/vendor/lib/libIMGegl.so \ - vendor/imgtec/crespo/proprietary/libpvr2d.so:system/vendor/lib/libpvr2d.so \ - vendor/imgtec/crespo/proprietary/libpvrANDROID_WSEGL.so:system/vendor/lib/libpvrANDROID_WSEGL.so \ - vendor/imgtec/crespo/proprietary/libPVRScopeServices.so:system/vendor/lib/libPVRScopeServices.so \ - vendor/imgtec/crespo/proprietary/libsrv_init.so:system/vendor/lib/libsrv_init.so \ - vendor/imgtec/crespo/proprietary/libsrv_um.so:system/vendor/lib/libsrv_um.so \ - vendor/imgtec/crespo/proprietary/libusc.so:system/vendor/lib/libusc.so + $(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.s5pc110.so:system/vendor/lib/hw/gralloc.s5pc110.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/nxp/staging/device-crespo.mk b/self-extractors/nxp/staging/device-crespo.mk index 7080234..f9cc5b0 100644 --- a/self-extractors/nxp/staging/device-crespo.mk +++ b/self-extractors/nxp/staging/device-crespo.mk @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# NXP blob necessary for crespo +LOCAL_PATH := vendor/nxp/crespo + +# NXP blob necessary for Nexus S hardware PRODUCT_COPY_FILES := \ - vendor/nxp/crespo/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 9698fd5..34558d9 100644 --- a/self-extractors/root/BoardConfigVendor.mk +++ b/self-extractors/root/BoardConfigVendor.mk @@ -12,9 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. --include vendor/akm/crespo/BoardConfigCrespo.mk --include vendor/broadcom/crespo/BoardConfigCrespo.mk --include vendor/cypress/crespo/BoardConfigCrespo.mk --include vendor/imgtec/crespo/BoardConfigCrespo.mk --include vendor/nxp/crespo/BoardConfigCrespo.mk --include vendor/samsung/crespo/BoardConfigCrespo.mk +LOCAL_STEM := crespo/BoardConfigCrespo.mk + +-include vendor/akm/$(LOCAL_STEM) +-include vendor/broadcom/$(LOCAL_STEM) +-include vendor/cypress/$(LOCAL_STEM) +-include vendor/imgtec/$(LOCAL_STEM) +-include vendor/nxp/$(LOCAL_STEM) +-include vendor/samsung/$(LOCAL_STEM) diff --git a/self-extractors/root/device-vendor.mk b/self-extractors/root/device-vendor.mk index 6e9affc..f941d11 100644 --- a/self-extractors/root/device-vendor.mk +++ b/self-extractors/root/device-vendor.mk @@ -12,9 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -$(call inherit-product-if-exists, vendor/akm/crespo/device-crespo.mk) -$(call inherit-product-if-exists, vendor/broadcom/crespo/device-crespo.mk) -$(call inherit-product-if-exists, vendor/cypress/crespo/device-crespo.mk) -$(call inherit-product-if-exists, vendor/imgtec/crespo/device-crespo.mk) -$(call inherit-product-if-exists, vendor/nxp/crespo/device-crespo.mk) -$(call inherit-product-if-exists, vendor/samsung/crespo/device-crespo.mk) +LOCAL_STEM := crespo/device-crespo.mk + +$(call inherit-product-if-exists, vendor/akm/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/broadcom/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/cypress/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/imgtec/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/nxp/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/samsung/$(LOCAL_STEM)) diff --git a/self-extractors/samsung/staging/device-crespo.mk b/self-extractors/samsung/staging/device-crespo.mk index aa0fb45..0488760 100644 --- a/self-extractors/samsung/staging/device-crespo.mk +++ b/self-extractors/samsung/staging/device-crespo.mk @@ -12,11 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +LOCAL_PATH := vendor/samsung/crespo + # Prebuilt libraries that are needed to build open-source libraries PRODUCT_COPY_FILES := \ - vendor/samsung/crespo/proprietary/libsecril-client.so:obj/lib/libsecril-client.so + $(LOCAL_PATH)/proprietary/libsecril-client.so:obj/lib/libsecril-client.so -# Samsung blobs necessary for crespo +# Samsung blobs necessary for Nexus S hardware PRODUCT_COPY_FILES += \ - vendor/samsung/crespo/proprietary/libsecril-client.so:system/lib/libsecril-client.so \ - vendor/samsung/crespo/proprietary/libsec-ril.so:system/vendor/lib/libsec-ril.so + $(LOCAL_PATH)/proprietary/libsecril-client.so:system/lib/libsecril-client.so \ + $(LOCAL_PATH)/proprietary/libsec-ril.so:system/vendor/lib/libsec-ril.so |