Redo all crespo and crespo4g binaries with the official Google ones p…

…lus the additional cypress-touchkey file In the past I have used the Google files and have had no problems with them, so it's always a good idea to use them here. I have also lumped them all together as opposed to the default vendor/akm or vendor/imgtec and so on.
Evervolv · Dec 27, 2011 · 5fce31f · 5fce31f
1 parent 138cf37
commit 5fce31f
Show file tree

Hide file tree

Showing 10 changed files with 173 additions and 123 deletions.
diff --git a/crespo/BoardConfig4gVendor.mk b/crespo/BoardConfig4gVendor.mk
@@ -12,4 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/samsung/crespo4g/setup-makefiles.sh
+LOCAL_STEM := crespo4g/BoardConfigCrespo4g.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/crespo/proprietary/Android.mk → crespo/BoardConfigCrespo.mk b/crespo/proprietary/Android.mk → crespo/BoardConfigCrespo.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 The Android Open Source Project
+# 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.
@@ -11,11 +11,3 @@
 # 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.
-
-# This file is generated by device/samsung/crespo/unzip-files.sh - DO NOT EDIT
-
-ifeq ($(TARGET_DEVICE),crespo)
-LOCAL_PATH:=$(call my-dir)
-
-endif
-
diff --git a/crespo/BoardConfigVendor.mk b/crespo/BoardConfigVendor.mk
@@ -12,4 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/samsung/crespo/setup-makefiles.sh
+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/crespo/device-crespo.mk b/crespo/device-crespo.mk
@@ -0,0 +1,55 @@
+# 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/crespo
+
+# Prebuilt libraries that are needed to build open-source libraries
+PRODUCT_COPY_FILES := \
+    $(LOCAL_PATH)/proprietary/libsecril-client.so:obj/lib/libsecril-client.so
+
+# Samsung blobs necessary for Nexus S hardware
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/proprietary/cypress-touchkey.bin:system/vendor/firmware/cypress-touchkey.bin \
+    $(LOCAL_PATH)/proprietary/libsecril-client.so:system/lib/libsecril-client.so \
+    $(LOCAL_PATH)/proprietary/libsec-ril.so:system/vendor/lib/libsec-ril.so
+
+# AKM blob necessary for Nexus S hardware
+PRODUCT_COPY_FILES := \
+    $(LOCAL_PATH)/proprietary/libakm.so:system/vendor/lib/libakm.so
+
+# Broadcom blobs necessary for Nexus S hardware
+PRODUCT_COPY_FILES := \
+    $(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
+
+# Imgtec blobs necessary for Nexus S 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.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
+
+# NXP blob necessary for Nexus S hardware
+PRODUCT_COPY_FILES := \
+    $(LOCAL_PATH)/proprietary/libpn544_fw.so:system/vendor/firmware/libpn544_fw.so
diff --git a/crespo/device-vendor-blobs.mk b/crespo/device-vendor-blobs.mk
diff --git a/crespo/device-vendor.mk b/crespo/device-vendor.mk
@@ -12,6 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/samsung/crespo/setup-makefiles.sh
+LOCAL_STEM := crespo/device-crespo.mk
 
-$(call inherit-product, vendor/samsung/crespo/device-vendor-blobs.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/crespo/device4g-vendor.mk b/crespo/device4g-vendor.mk
@@ -12,12 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/samsung/crespo4g/setup-makefiles.sh
+LOCAL_STEM := crespo4g/device-crespo4g.mk
 
-PRODUCT_PACKAGES := \
-    ODB \
-    SprintMenu \
-    SystemUpdateUI \
-    WiMAXSettings
-
-$(call inherit-product, vendor/samsung/crespo4g/device-vendor-blobs.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/crespo4g/BoardConfigCrespo4g.mk b/crespo4g/BoardConfigCrespo4g.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/crespo4g/device-crespo4g.mk b/crespo4g/device-crespo4g.mk
@@ -0,0 +1,74 @@
+# 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/crespo4g
+
+# Prebuilt libraries that are needed to build open-source libraries
+PRODUCT_COPY_FILES := \
+    $(LOCAL_PATH)/proprietary/libsecril-client.so:obj/lib/libsecril-client.so
+
+# Samsung blobs necessary for Nexus S hardware
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/proprietary/cypress-touchkey.bin:system/vendor/firmware/cypress-touchkey.bin \
+    $(LOCAL_PATH)/proprietary/libsecril-client.so:system/lib/libsecril-client.so \
+    $(LOCAL_PATH)/proprietary/libsec-ril.so:system/vendor/lib/libsec-ril.so
+
+# Samsung blobs necessary for CDMA/WiMAX on Nexus S hardware
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/proprietary/libWiMAXNative.so:system/lib/libWiMAXNative.so \
+    $(LOCAL_PATH)/proprietary/wimaxfw.bin:system/vendor/firmware/wimaxfw.bin \
+    $(LOCAL_PATH)/proprietary/wimaxloader.bin:system/vendor/firmware/wimaxloader.bin \
+    $(LOCAL_PATH)/proprietary/wimax_boot.bin:system/vendor/firmware/wimax_boot.bin \
+    $(LOCAL_PATH)/proprietary/libSECmWiMAXcAPI.so:system/vendor/lib/libSECmWiMAXcAPI.so \
+    $(LOCAL_PATH)/proprietary/wimax_service.jar:system/vendor/lib/wimax_service.jar
+
+# Samsung proprietary applications to support WiMAX, CDMA and Sprint
+PRODUCT_PACKAGES := \
+    WiMAXSettings \
+    SprintMenu \
+    WiMAXHiddenMenu \
+    SystemUpdateUI
+
+# Overlay for WiMAX-related settings
+DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/crespo4g_overlay
+
+# AKM blob necessary for Nexus S hardware
+PRODUCT_COPY_FILES := \
+    $(LOCAL_PATH)/proprietary/libakm.so:system/vendor/lib/libakm.so
+
+# Broadcom blobs necessary for Nexus S hardware
+PRODUCT_COPY_FILES := \
+    $(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
+
+# Imgtec blobs necessary for Nexus S 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.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
+
+# NXP blob necessary for Nexus S hardware
+PRODUCT_COPY_FILES := \
+    $(LOCAL_PATH)/proprietary/libpn544_fw.so:system/vendor/firmware/libpn544_fw.so
diff --git a/crespo4g/device-vendor-blobs.mk b/crespo4g/device-vendor-blobs.mk