merge from bravo base (not yet ready)

Android.mk

@@ -20,9 +20,6 @@ subdir_makefiles := \
 	$(LOCAL_PATH)/liblights/Android.mk \
 	$(LOCAL_PATH)/libgps/Android.mk
 
-#	$(LOCAL_PATH)/libreference-ril/Android.mk \
-#	$(LOCAL_PATH)/libhtc_ril_wrapper/Android.mk \
-
 include $(subdir_makefiles)
 
 endif

BoardConfig.mk

@@ -23,11 +23,12 @@
 # WARNING: This line must come *before* including the proprietary
 # variant, so that it gets overwritten by the parent (which goes
 # against the traditional rules of inheritance).
-USE_CAMERA_STUB := false
+USE_CAMERA_STUB := true
 
 # inherit from the proprietary version
 -include vendor/htc/leo/BoardConfigVendor.mk
 
+TARGET_BOOTLOADER_BOARD_NAME := htcleo
 TARGET_NO_BOOTLOADER := true
 
 TARGET_BOARD_PLATFORM := qsd8k
@@ -36,13 +37,18 @@ TARGET_BOARD_PLATFORM_GPU := qcom-adreno200
 TARGET_CPU_ABI := armeabi-v7a
 TARGET_CPU_ABI2 := armeabi
 TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_ARCH_VARIANT_CPU := cortex-a8
+TARGET_ARCH_VARIANT_FPU := neon
 ARCH_ARM_HAVE_TLS_REGISTER := true
-TARGET_BOOTLOADER_BOARD_NAME := htcleo
+ARCH_ARM_HAVE_VFP := true
 
 # FPU compilation flags
 TARGET_GLOBAL_CFLAGS += -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
 TARGET_GLOBAL_CPPFLAGS += -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
 
+# Call headers from msm-3.0: needed to build libs in hardware/qcom/display
+TARGET_SPECIFIC_HEADER_PATH := device/htc/leo/include
+
 # Wifi related defines
 BOARD_WPA_SUPPLICANT_DRIVER := WEXT
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_wext
@@ -51,12 +57,14 @@ BOARD_WLAN_DEVICE           := bcm4329
 WIFI_DRIVER_MODULE_PATH     := "/system/lib/modules/bcm4329.ko"
 WIFI_DRIVER_FW_PATH_STA     := "/vendor/firmware/fw_bcm4329.bin"
 WIFI_DRIVER_FW_PATH_AP      := "/vendor/firmware/fw_bcm4329_apsta.bin"
-WIFI_DRIVER_MODULE_ARG      := "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/proc/calibration"
+WIFI_DRIVER_MODULE_ARG      := "iface_name=wlan firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/proc/calibration"
 WIFI_DRIVER_MODULE_NAME     := "bcm4329"
 
 BOARD_KERNEL_CMDLINE := no_console_suspend=1 wire.search_count=5
 
 BOARD_USES_GENERIC_AUDIO := false
+COMMON_GLOBAL_CFLAGS += -DUSES_AUDIO_LEGACY
+
 BOARD_KERNEL_BASE := 0x11800000
 BOARD_KERNEL_NEW_PPPOX := true
 
@@ -67,18 +75,36 @@ BOARD_VENDOR_QCOM_AMSS_VERSION := 3200
 
 BOARD_VENDOR_USE_AKMD := akm8973
 
-#BOARD_USE_FROYO_LIBCAMERA := true
+BOARD_HAVE_FM_RADIO := true
+BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO
+
+# RIL
+BOARD_USE_NEW_LIBRIL_HTC := true
 
+# Hardware rendering
+BOARD_EGL_CFG := device/htc/leo/prebuilt/egl.cfg
+USE_OPENGL_RENDERER     := true
+TARGET_USES_GENLOCK     := true
 TARGET_USES_16BPPSURFACE_FOR_OPAQUE := true
+# We only have 2 buffers so still need to hack it.
+COMMON_GLOBAL_CFLAGS    += -DMISSING_GRALLOC_BUFFERS
+# Just a safety measure to make sure its all included
+COMMON_GLOBAL_CFLAGS    += -DQCOM_HARDWARE
+# Force refresh rate since fps calc is broke and reports 0
+COMMON_GLOBAL_CFLAGS    += -DREFRESH_RATE=60
+# qsd8k: no support for overlay, bypass, or c2d
+TARGET_USE_OVERLAY      := false
+TARGET_HAVE_BYPASS      := false
+TARGET_USES_C2D_COMPOSITION := false
+# Allow fallback to ashmem
+TARGET_GRALLOC_USES_ASHMEM := true
+# Debuging egl
+COMMON_GLOBAL_CFLAGS    += -DEGL_TRACE
+
 BOARD_USES_QCOM_LIBS := true
 BOARD_USES_QCOM_HARDWARE := true
 
-BOARD_USE_KINETO_COMPATIBILITY := true
-
-BOARD_HAVE_FM_RADIO := true
-BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO
-
-TARGET_CUSTOM_RELEASETOOL := device/htc/leo/releasetools/squisher
+#TARGET_CUSTOM_RELEASETOOL := device/htc/leo/releasetools/squisher
 
 # # cat /proc/mtd
 # dev:    size   erasesize  name
@@ -106,14 +132,16 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 3200
 
 TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/leo/prebuilt/recovery_kernel
 
-# Hardware rendering
-#USE_OPENGL_RENDERER := true
-BOARD_EGL_CFG := device/htc/leo/prebuilt/egl.cfg
-BOARD_NO_RGBX_8888 := true
-BOARD_USES_OVERLAY := true
-COMMON_GLOBAL_CFLAGS += -DMISSING_EGL_EXTERNAL_IMAGE -DMISSING_EGL_PIXEL_FORMAT_YV12 -DMISSING_GRALLOC_BUFFERS -DUNABLE_TO_DEQUEUE
-
-# Call headers from msm-3.0: needed to build libs in hardware/qcom/display
-TARGET_SPECIFIC_HEADER_PATH := device/htc/leo/include
+# Misc
+BOARD_USE_OPENSSL_ENGINE := true
 
+# Hacks
 TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/devices/platform/usb_mass_storage/lun0/file
+BOARD_USE_LEGACY_TRACKPAD := true
+TARGET_FORCE_CPU_UPLOAD := true
+
+
+
+
+
+

cm.mk

@@ -1,28 +1,21 @@
-## Specify phone tech before including full_phone
-$(call inherit-product, vendor/cm/config/gsm.mk)
-
-# Release name
-PRODUCT_RELEASE_NAME := GN
+# Inherit AOSP device configuration for leo.
+$(call inherit-product, device/htc/leo/full_leo.mk)
 
-# Inherit some common CM stuff.
+# Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-# Inherit device configuration
-$(call inherit-product, device/htc/leo/full_leo.mk)
+# Include GSM stuff
+$(call inherit-product, vendor/cm/config/gsm.mk)
+
 
 ## Device identifier. This must come after all inclusions
 PRODUCT_MODEL := HTC HD2
 PRODUCT_MANUFACTURER := HTC
 PRODUCT_BRAND := htc
 PRODUCT_DEVICE := leo
 PRODUCT_NAME := cm_leo
+PRODUCT_CODENAME := leo
 
-#Set build fingerprint / ID / Prduct Name ect.
+# Set build fingerprint / ID / Prduct Name ect.
 PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=leo BUILD_ID=IML74K BUILD_DISPLAY_ID=IML74K BUILD_FINGERPRINT="google/htc_leo/leo:4.0.3/IML74K/239410:user/release-keys" PRVIATE_BUILD_DESC="full_leo-user 4.0.3 IML74K 239410 release-keys"
 
-# Release name and versioning
-PRODUCT_RELEASE_NAME := LEO
-#PRODUCT_VERSION_DEVICE_SPECIFIC := -aali
-
--include vendor/cm/products/common_versions.mk
-

full_leo.mk

@@ -22,7 +22,7 @@
 # Inherit from those products. Most specific first.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 $(call inherit-product, device/htc/leo/leo_eu.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 # Leo uses high-density artwork where available
 PRODUCT_LOCALES += hdpi