Patch 7

Android.mk

@@ -1,10 +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.
+
 LOCAL_PATH := $(my-dir)
 
 ifeq ($(TARGET_DEVICE),pico)
-    subdir_makefiles := \
-	 $(LOCAL_PATH)/libaudio/Android.mk \
-#	 $(LOCAL_PATH)/libacoustic/Android.mk \
-#	 $(LOCAL_PATH)/libcamera/Android.mk \
-#        $(LOCAL_PATH)/brcm_patchram_plus/Android.mk  
-     include $(subdir_makefiles)
-endif
+include $(call all-makefiles-under,$(LOCAL_PATH))
+endif

AndroidBoard.mk

@@ -1,3 +1,23 @@
+# Copyright (C) 2009 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.
+
+#
+# AndroidBoard.mk is a legacy mechanism to deal with a few
+# edge-cases that can't be managed otherwise. No new rules
+# should be added to this file.
+#
+
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)

AndroidProducts.mk

@@ -1,2 +1,18 @@
+#
+# 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.
+#
+
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/pico.mk

BoardConfig.mk

@@ -4,7 +4,7 @@
 # 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
+# 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,
@@ -15,13 +15,8 @@
 
 USE_CAMERA_STUB := true
 
-COMMON_GLOBAL_CFLAGS += -DBINDER_COMPAT
-
-# Needs Review
-#BOARD_CAMERA_USE_GETBUFFERINFO := true
-# This is needed by libcamera.so
-BOARD_USE_NASTY_PTHREAD_CREATE_HACK := true
-BOARD_USE_CAF_LIBCAMERA := true
+TARGET_GLOBAL_CFLAGS += -mfpu=neon -mfloat-abi=softfp
+TARGET_GLOBAL_CPPFLAGS += -mfpu=neon -mfloat-abi=softfp
 
 # Arch related defines
 TARGET_BOARD_PLATFORM := msm7x27a
@@ -31,29 +26,26 @@ TARGET_BOARD_PLATFORM_GPU := qcom-adreno200
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_RADIOIMAGE := true
 
-# Yes we do,but let's hash it out 
-# ARCH_ARM_HAVE_VFP := true
+# Yes we do,but let's hash it out
 TARGET_ARCH_VARIANT := armv7-a-neon
 TARGET_CPU_ABI := armeabi-v7a
 TARGET_CPU_ABI2 := armeabi
 ARCH_ARM_HAVE_TLS_REGISTER := true
 TARGET_BOOTLOADER_BOARD_NAME := pico
 BOARD_NO_SPEAKER := true # msm7627a doesn't have speaker
 TARGET_CORTEX_CACHE_LINE_32 := true
-TARGET_USE_SPARROW_BIONIC_OPTIMIZATION := true
 
 # Kernel
 BOARD_KERNEL_CMDLINE := no_console_suspend=1 console=null
 BOARD_KERNEL_BASE := 0x12c00000
 BOARD_PAGE_SIZE := 0x00000800
 
 # Additional librarys
-
 TARGET_PROVIDES_LIBAUDIO := true
 
 # Fix this up by examining /proc/mtd on a running device
 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00400000
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00500000
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00600000  #kernel don't fit anymore in recovery!
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x0eb40000
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x09600000
 BOARD_FLASH_BLOCK_SIZE := 262144
@@ -70,30 +62,34 @@ BOARD_USE_USB_MASS_STORAGE_SWITCH := true
 TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/devices/platform/usb_mass_storage/lun0/file"
 BOARD_UMS_LUNFILE := "/sys/devices/platform/usb_mass_storage/lun0/file"
 
-#  Bluetooth
+# Bluetooth
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
 
 TARGET_SPECIFIC_HEADER_PATH := device/htc/pico/include
 
 # OpenGL drivers config file path
-BOARD_EGL_CFG := device/htc/pico/prebuilt/lib/egl/egl.cfg
+BOARD_EGL_CFG := vendor/htc/pico/proprietary/lib/egl/egl.cfg
 BOARD_USES_QCOM_HARDWARE := true
 BOARD_USES_QCOM_LIBRPC := true
 BOARD_USES_QCOM_LIBS := true
 TARGET_GRALLOC_USES_ASHMEM := true
-COMMON_GLOBAL_CFLAGS += -DTARGET_MSM7x27
 
 # Wifi related defines
-BOARD_WPA_SUPPLICANT_DRIVER      := WEXT
+BOARD_WPA_SUPPLICANT_DRIVER      := NL80211
 WPA_SUPPLICANT_VERSION           := VER_0_8_X
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_wext
-BOARD_WLAN_DEVICE                := bcm4330
-WIFI_DRIVER_MODULE_PATH          := "/system/lib/modules/bcm4330.ko"
-WIFI_DRIVER_FW_PATH_STA          := "/system/etc/firmware/fw_bcm4330b2.bin"
-WIFI_DRIVER_FW_PATH_AP           := "/system/etc/firmware/fw_bcm4330b2_apsta.bin"
-WIFI_DRIVER_MODULE_NAME          := "bcm4330"
-WIFI_DRIVER_MODULE_ARG           := "firmware_path=/system/etc/firmware/fw_bcm4330b2.bin nvram_path=/proc/calibration iface_name=eth0"
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
+BOARD_HOSTAPD_DRIVER             := NL80211
+BOARD_HOSTAPD_PRIVATE_LIB        := lib_driver_cmd_bcmdhd
+BOARD_WLAN_DEVICE                := bcmdhd
+WIFI_DRIVER_FW_PATH_PARAM        := "/sys/module/bcmdhd/parameters/firmware_path"
+WIFI_DRIVER_MODULE_PATH          := "/system/lib/modules/bcmdhd.ko"
+WIFI_DRIVER_FW_PATH_STA          := "/system/etc/firmware/fw_bcm4330_b2.bin"
+WIFI_DRIVER_FW_PATH_AP           := "/system/etc/firmware/fw_bcm4330_apsta_b2.bin"
+WIFI_DRIVER_FW_PATH_P2P          := "/system/etc/firmware/fw_bcm4330_p2p_b2.bin"
+WIFI_DRIVER_MODULE_NAME          := "bcmdhd"
+WIFI_DRIVER_MODULE_ARG           := "firmware_path=/system/etc/firmware/fw_bcm4330_b2.bin nvram_path=/proc/calibration iface_name=eth0"
+WIFI_BAND                        := 802_11_ABG
 
 # Releasetools
 TARGET_RELEASETOOLS_EXTENSIONS := device/htc/pico/releasetools
@@ -104,38 +100,60 @@ BOARD_USES_QCOM_GPS := true
 BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := pico
 BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 50000
 
-#TARGET_LIBAGL_USE_GRALLOC_COPYBITS := true
-DCHECK_FOR_EXTERNAL_FORMAT := true
+# Misc
+TARGET_BOOTANIMATION_PRELOAD := true
+
+# Graphics
 BOARD_USE_SKIA_LCDTEXT := true
-BOARD_FORCE_DITHERING := true
-USE_OPENGL_RENDERER := true
 TARGET_USES_GENLOCK := true
+USE_OPENGL_RENDERER := true
+BOARD_ADRENO_DECIDE_TEXTURE_TARGET := true
 TARGET_FORCE_CPU_UPLOAD := true
 BOARD_AVOID_DRAW_TEXTURE_EXTENSION := true
-#COMMON_GLOBAL_CFLAGS += -DMISSING_GRALOC_BUFFERS 
-#COMMON_GLOBAL_CFLAGS += -DMISSING_EGL_PIXEL_FORMAT_YV12 
-#COMMON_GLOBAL_CFLAGS += -DMISSING_EGL_EXTERNAL_IMAGE
-COMMON_GLOBAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
-
-# Browser
-WITH_JIT := true
-ENABLE_JSC_JIT := true
-JS_ENGINE := v8
-HTTP := chrome
-
-# ICS Stuff 
+TARGET_USES_C2D_COMPOSITION := false
+TARGET_USES_SF_BYPASS := false
+TARGET_HAVE_BYPASS := false
+TARGET_USES_OVERLAY := false
+TARGET_QCOM_HDMI_OUT := false
+TARGET_NO_HW_VSYNC := true
+
+# Caf 
+TARGET_CPU_SMP := true
+TARGET_AVOID_DRAW_TEXTURE_EXTENSION := true
+TARGET_USES_16BPPSURFACE_FOR_OPAQUE := true
+BOARD_HAS_8BIT_BCHECC_SUPPORT := true
+BOARD_KERNEL_BCHECC_SPARESIZE := 160
+BOARD_HAVE_MXT224_CFG := true
+TARGET_HAVE_TSLIB := true
+MM_AUDIO_OMX_ADEC_EVRC_DISABLED := false
+MM_AUDIO_OMX_ADEC_QCELP13_DISABLED := false
+MM_AUDIO_FTM_DISABLED := false
+MM_AUDIO_MEASUREMENT_DISABLED := false
+BOARD_USES_QCNE := true
+PROTEUS_DEVICE_API := true
+MM_AUDIO_VOEM_DISABLED := false
+TARGET_USES_PMEM := true
+BOARD_USES_QCOM_AUDIO_SPEECH := true
+
+# ICS Stuff
 BOARD_HAS_NO_SELECT_BUTTON := true
 
 # RIL
-BOARD_USE_NEW_LIBRIL_HTC := true
+BOARD_USES_LEGACY_RIL := true
+COMMON_GLOBAL_CFLAGS += -DRIL_VERSION_2_SUPPORT
 
-#COMMON_GLOBAL_CFLAGS += -DUSE_htc_ALS_DUMMY
+# Camera
+BOARD_NEEDS_MEMORYHEAPPMEM := true
+CAMERA_USES_SURFACEFLINGER_CLIENT_STUB := true
+COMMON_GLOBAL_CFLAGS += -DICS_CAMERA_BLOB
 
+# Add h/w acceleration in browser :)
+ENABLE_WEBGL := true
 WITH_JIT := true
 ENABLE_JSC_JIT := true
 JS_ENGINE := v8
-COMMON_GLOBAL_CFLAGS += -DQCOM_HARDWARE
-COMMON_GLOBAL_CFLAGS += -DREFRESH_RATE=60
+HTTP := chrome
+COMMON_GLOBAL_CFLAGS += -DQCOM_HARDWARE -DREFRESH_RATE=65
 
 # Touch screen compatibility for ICS
 BOARD_USE_LEGACY_TOUCHSCREEN := true

README.md

@@ -0,0 +1,6 @@
+android_device_htc_pico_jb
+==========================
+
+cm10 device tree for htc pico 
+
+Work in progress

cm.mk

@@ -1,35 +1,27 @@
 # Prepare for new BootAnimation
 TARGET_BOOTANIMATION_NAME := vertical-320x480
 
-## Specify phone tech before including full_phone
-$(call inherit-product, vendor/cm/config/gsm.mk)
-
 # Include GSM stuff
 $(call inherit-product, vendor/cm/config/gsm.mk)
 
-# Inherit from those products. Most specific first
-$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
-
-#$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
-$(call inherit-product, device/common/gps/gps_eu_supl.mk)
-
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cm/config/common_mini_phone.mk)
+$(call inherit-product, device/common/gps/gps_eu_supl.mk)
+$(call inherit-product, frameworks/native/build/phone-hdpi-512-dalvik-heap.mk)
 
 # Inherit device configuration
 $(call inherit-product, device/htc/pico/pico.mk)
 
-# Include FM-Radio stuff
-#$(call inherit-product, vendor/cm/products/bcm_fm_radio.mk)
+# Release name and versioning
+PRODUCT_RELEASE_NAME := pico
+PRODUCT_VERSION_DEVICE_SPECIFIC := -UNOFFICIAL-ALPHA3
+CM_RELEASE := true
 
+# Product name
 PRODUCT_NAME := cm_pico
-PRODUCT_BRAND := htc_europe
+PRODUCT_BRAND := HTC
 PRODUCT_DEVICE := pico
-PRODUCT_MODEL := HTC Explorer A310
+PRODUCT_MODEL := HTC Explorer A310e
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=pico BUILD_ID=IMLK74 BUILD_FINGERPRINT=htc_asia_india/htc_pico/pico:2.3.5/GRJ90/171430.1:user/release-keys PRIVATE_BUILD_DESC="1.12.720.1 CL171430 release-keys"
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := pico
-PRODUCT_VERSION_DEVICE_SPECIFIC :=
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=pico BUILD_ID=JZO54K BUILD_FINGERPRINT=htc_asia_india/htc_pico/pico:2.3.5/GRJ90/171430.1:user/release-keys PRIVATE_BUILD_DESC="1.12.720.1 CL171430 release-keys"