revert webkit accel - not stable enough (causes occasional kps) (2/2)

leo: fix broken gps and updated broadcom formware

leo-vendor-blobs.mk

@@ -20,34 +20,30 @@ PRODUCT_COPY_FILES := \
 
 # All the blobs necessary for leo
 PRODUCT_COPY_FILES += \
-	vendor/htc/leo/proprietary/akmd:system/bin/akmd \
-	vendor/htc/leo/proprietary/parse_radio_log:system/bin/parse_radio_log \
-	vendor/htc/leo/proprietary/AdieHWCodecSetting.csv:system/etc/AdieHWCodecSetting.csv \
-	vendor/htc/leo/proprietary/AudioBTID.csv:system/etc/AudioBTID.csv \
-	vendor/htc/leo/proprietary/bcm4329.hcd:system/etc/firmware/bcm4329.hcd \
-	vendor/htc/leo/proprietary/default.acdb:system/etc/firmware/default.acdb \
-	vendor/htc/leo/proprietary/yamato_pfp.fw:system/etc/firmware/yamato_pfp.fw \
-	vendor/htc/leo/proprietary/yamato_pm4.fw:system/etc/firmware/yamato_pm4.fw \
-	vendor/htc/leo/proprietary/libgsl.so:system/lib/libgsl.so \
-	vendor/htc/leo/proprietary/libhtc_acoustic.so:system/lib/libhtc_acoustic.so \
-	vendor/htc/leo/proprietary/libhtc_ril.so:system/lib/libhtc_ril.so \
-	vendor/htc/leo/proprietary/libhtc_ril_wrapper.so:system/lib/libhtc_ril_wrapper.so \
-	vendor/htc/leo/proprietary/libsc-a2xx.so:system/lib/libsc-a2xx.so
-
-# Camera
-PRODUCT_COPY_FILES += \
-	vendor/htc/leo/proprietary/libcamera.so:system/lib/libcamera.so \
-	vendor/htc/leo/proprietary/liboemcamera.so:system/lib/liboemcamera.so
-
-# GPS
-PRODUCT_COPY_FILES += \
-	vendor/htc/leo/proprietary/librpc.so:system/lib/librpc.so \
-	vendor/htc/leo/proprietary/libgps.so:system/lib/libgps.so
-
-# HW Acceleration
-PRODUCT_COPY_FILES += \
-	vendor/htc/leo/proprietary/eglsubAndroid.so:system/lib/egl/eglsubAndroid.so \
-	vendor/htc/leo/proprietary/libEGL_adreno200.so:system/lib/egl/libEGL_adreno200.so \
-	vendor/htc/leo/proprietary/libGLESv1_CM_adreno200.so:system/lib/egl/libGLESv1_CM_adreno200.so \
-	vendor/htc/leo/proprietary/libGLESv2_adreno200.so:system/lib/egl/libGLESv2_adreno200.so \
-	vendor/htc/leo/proprietary/libq3dtools_adreno200.so:system/lib/egl/libq3dtools_adreno200.so
+    vendor/htc/leo/proprietary/akmd:system/bin/akmd \
+    vendor/htc/leo/proprietary/parse_radio_log:system/bin/parse_radio_log \
+    vendor/htc/leo/proprietary/vold:system/bin/vold \
+    vendor/htc/leo/proprietary/AudioBTID.csv:system/etc/AudioBTID.csv \
+    vendor/htc/leo/proprietary/AdieHWCodecSetting.csv:system/etc/AdieHWCodecSetting.csv \
+    vendor/htc/leo/proprietary/BCM4329B1_002.002.023.0360.0362.hcd:system/etc/firmware/BCM4329B1_002.002.023.0360.0362.hcd \
+    vendor/htc/leo/proprietary/BCM4329B1_002.002.023.0436.0439.hcd:system/etc/firmware/BCM4329B1_002.002.023.0436.0439.hcd \
+    vendor/htc/leo/proprietary/BCM4329B1_002.002.023.0511.0538.hcd:system/etc/firmware/BCM4329B1_002.002.023.0511.0538.hcd \
+    vendor/htc/leo/proprietary/bcm4329.hcd:system/etc/firmware/bcm4329.hcd \
+    vendor/htc/leo/proprietary/htcleo.acdb:system/etc/firmware/htcleo.acdb \
+    vendor/htc/leo/proprietary/default.acdb:system/etc/firmware/default.acdb \
+    vendor/htc/leo/proprietary/yamato_pfp.fw:system/etc/firmware/yamato_pfp.fw \
+    vendor/htc/leo/proprietary/yamato_pm4.fw:system/etc/firmware/yamato_pm4.fw \
+    vendor/htc/leo/proprietary/libEGL_adreno200.so:system/lib/egl/libEGL_adreno200.so \
+    vendor/htc/leo/proprietary/libGLESv1_CM_adreno200.so:system/lib/egl/libGLESv1_CM_adreno200.so \
+    vendor/htc/leo/proprietary/libGLESv2_adreno200.so:system/lib/egl/libGLESv2_adreno200.so \
+    vendor/htc/leo/proprietary/libq3dtools_adreno200.so:system/lib/egl/libq3dtools_adreno200.so \
+    vendor/htc/leo/proprietary/libaudio.so:system/lib/libaudio.so \
+    vendor/htc/leo/proprietary/libcamera.so:system/lib/libcamera.so \
+    vendor/htc/leo/proprietary/libgsl.so:system/lib/libgsl.so \
+    vendor/htc/leo/proprietary/libhtc_acoustic.so:system/lib/libhtc_acoustic.so \
+    vendor/htc/leo/proprietary/libhtc_ril.so:system/lib/libhtc_ril.so \
+    vendor/htc/leo/proprietary/liboemcamera.so:system/lib/liboemcamera.so \
+    vendor/htc/leo/proprietary/libOmxVdec.so:system/lib/libOmxVdec.so \
+    vendor/htc/leo/proprietary/libOmxVidEnc.so:system/lib/libOmxVidEnc.so \
+    vendor/htc/leo/proprietary/libOmxCore.so:system/lib/libOmxCore.so \
+    vendor/htc/leo/proprietary/sensors.bravo.so:system/lib/hw/sensors.bravo.so \

leo-vendor.mk

@@ -14,7 +14,19 @@
 
 # This file is generated by device/htc/leo/setup-makefiles.sh
 
-PRODUCT_COPY_FILES += \
-    packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
+# Live wallpaper packages
+PRODUCT_PACKAGES := \
+    LiveWallpapers \
+    LiveWallpapersPicker \
+    MagicSmokeWallpapers \
+    VisualizationWallpapers \
+    librs_jni
+
+# Publish that we support the live wallpaper feature.
+PRODUCT_COPY_FILES := \
+    packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml
+
+# Pick up overlay for features that depend on non-open-source files
+DEVICE_PACKAGE_OVERLAYS := vendor/htc/leo/overlay
 
 $(call inherit-product, vendor/htc/leo/leo-vendor-blobs.mk)

overlay/packages/apps/Launcher2/res/layout/all_apps.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- This file is generated by device/htc/leo/setup-makefiles.sh -->
+
+<!-- switch to all_apps_3d on devices that support RenderScript -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <include layout="@layout/all_apps_3d" />
+</merge>

proprietary/AdieHWCodecSetting.csv

@@ -1,4 +1,4 @@
-HEADER,PASSION_HTC_20091019,,,,,,,,,,,,,,,
+HEADER,LEO_HTC_20091019,,,,,,,,,,,,,,,
 A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00
 HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000 ,HTC_ActionUnitHandsetTx8000,HTC_ActionUnitHandsetTx8000,HTC_ActionUnitHandsetTx8000
 ADIE_CODEC_ACTION_STAGE_REACHED,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_STAGE_REACHED,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_STAGE_REACHED,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_STAGE_REACHED,ADIE_CODEC_ACTION_HAL_ENTRY,ADIE_CODEC_ACTION_HAL_ENTRY

proprietary/AudioBTID.csv

@@ -1,26 +1,24 @@
-HEADER,PASSION_HTC_20091105
-Default,9,10
-Default Car-kit,9,10
+HEADER,ACE_HTC_20100911,
+Default,1001,1101
+Default Car-kit,1201,1301
+JKDAP3264,1002,1102
 JKDAP3265,1003,1103
-JKDAP3264,1004,1104
-HTC BH M200,1005,1105
-BH M300,1006,1106
-Jabra BT530,1007,1107
-Jabra BT5010,1008,1108
-Jabra BT3030,1009,1109
-Nokia BH-208,1010,1110
-Nokia BH-703,1011,1111
-Nokia BH-103,1012,1112
-Samsung WEP410,1013,1113
-3xxPlantronics,1014,1114
-6XXPlantronics,1015,1115
-8XXPlantronics,1016,1116
-Motorola H710,1017,1117
-Motorola H12,1018,1118
-Motorola S9,1019,1119
-HBH-IV840,1020,1120
-HBH-PV710,1021,1121
-HBH-DS220,1022,1122
-HBH-DS980,1023,1123
-Nexus One Car Dock,1024,1124
-END
+9xxPlantronics,1004,1104
+PROPlantronics,1005,1105
+9xxBackBeat,1006,1106
+Motorola H790,1007,1107
+Motorola S9,1009,1109
+HBH-IV840,1010,1110
+HBH-PV740,1011,1111
+HBH-DS220,1012,1112
+HBH-DS980,1013,1113
+Jabra Halo,1014,1114
+Jabra STONE,1015,1115
+Jabra BT3030,1016,1116
+BH M300,1017,1117
+Nokia BH-905,1018,1118
+Nokia BH-106,1019,1119
+Nokia BH-216,1020,1120
+Samsung WEP410,1021,1121
+BHM400_0603-2,1022,1122
+END,,