diff --git a/AndroidBoard.mk b/AndroidBoard.mk index bf71087..7911f61 100644 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -1,6 +1 @@ LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := bahamas-keypad.kcm -LOCAL_MODULE_TAGS := optional -include $(BUILD_KEY_CHAR_MAP) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index dfb8849..6a57872 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -26,4 +26,4 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/tattoo.mk + $(LOCAL_DIR)/click.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index 093ba24..a2f2a52 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -12,7 +12,7 @@ USE_CAMERA_STUB := true BOARD_USE_FROYO_LIBCAMERA := true # inherit from the proprietary version --include device/htc/tattoo/BoardConfigVendor.mk +-include device/htc/click/BoardConfigVendor.mk # ARMv6-compatible processor rev 5 (v6l) TARGET_BOARD_PLATFORM := msm7k @@ -24,12 +24,12 @@ TARGET_BOOTLOADER_BOARD_NAME := bahamas TARGET_NO_BOOTLOADER := true TARGET_NO_RADIOIMAGE := true -TARGET_NO_RECOVERY := false +TARGET_NO_RECOVERY := true -BOARD_LDPI_RECOVERY := true +BOARD_LDPI_RECOVERY := false -TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/tattoo/custom/recovery_kernel -TARGET_PREBUILT_KERNEL := device/htc/tattoo/custom/kernel +TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/click/custom/recovery_kernel +TARGET_PREBUILT_KERNEL := device/htc/click/custom/kernel # Wifi related defines BOARD_WPA_SUPPLICANT_DRIVER := CUSTOM @@ -39,8 +39,8 @@ WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/wlan.ko" WIFI_DRIVER_MODULE_ARG := "" WIFI_DRIVER_MODULE_NAME := "wlan" WIFI_FIRMWARE_LOADER := "wlan_loader" -WIFI_DRIVER_FW_STA_PATH := "/etc/firmware/tiinit_5.3.53.bts" -WIFI_DRIVER_FW_AP_PATH := "/etc/wifi/Fw1251r1c.bin" +#WIFI_DRIVER_FW_STA_PATH := "/etc/firmware/tiinit_5.3.53.bts" +#WIFI_DRIVER_FW_AP_PATH := "/etc/wifi/Fw1251r1c.bin" TARGET_PROVIDES_INIT_RC := false @@ -50,7 +50,7 @@ BOARD_KERNEL_BASE := 0x02E00000 BOARD_USES_GENERIC_AUDIO := false # Use HTC USB Function Switch to enable tethering via USB -BOARD_USE_HTC_USB_FUNCTION_SWITCH := true +# BOARD_USE_HTC_USB_FUNCTION_SWITCH := true BOARD_USE_USB_MASS_STORAGE_SWITCH := true @@ -65,7 +65,7 @@ BOARD_HAS_LIMITED_EGL := true TARGET_HARDWARE_3D := false # OpenGL drivers config file path -BOARD_EGL_CFG := device/htc/tattoo/egl.cfg +BOARD_EGL_CFG := device/htc/click/egl.cfg # No authoring clock for OpenCore # BOARD_NO_PV_AUTHORING_CLOCK := true @@ -92,7 +92,7 @@ TARGET_RELEASETOOLS_EXTENSIONS := device/htc/common # mtd3: 09600000 00020000 "system" # mtd4: 09600000 00020000 "cache" # mtd5: 0a520000 00020000 "userdata" -# Changed for Tattoo +# Changed for click BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00280000 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00500000 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x09600000 diff --git a/BoardConfigVendor.mk b/BoardConfigVendor.mk index 3999646..a23b18b 100644 --- a/BoardConfigVendor.mk +++ b/BoardConfigVendor.mk @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/htc/tattoo/setup-makefiles.sh +# This file is generated by device/htc/click/setup-makefiles.sh USE_CAMERA_STUB := false diff --git a/KernelModules.mk b/KernelModules.mk index 15655de..8524cac 100644 --- a/KernelModules.mk +++ b/KernelModules.mk @@ -1,42 +1,42 @@ # Kernel Modules TO BE COPIED PRODUCT_COPY_FILES += \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.usbmap:system/lib/modules/2.6.29-Kalim/modules.usbmap \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.alias:system/lib/modules/2.6.29-Kalim/modules.alias \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.symbols:system/lib/modules/2.6.29-Kalim/modules.symbols \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.isapnpmap:system/lib/modules/2.6.29-Kalim/modules.isapnpmap \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.ofmap:system/lib/modules/2.6.29-Kalim/modules.ofmap \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.ccwmap:system/lib/modules/2.6.29-Kalim/modules.ccwmap \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.pcimap:system/lib/modules/2.6.29-Kalim/modules.pcimap \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.ieee1394map:system/lib/modules/2.6.29-Kalim/modules.ieee1394map \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.seriomap:system/lib/modules/2.6.29-Kalim/modules.seriomap \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/netfilter/xt_TCPMSS.ko:system/lib/modules/2.6.29-Kalim/kernel/net/netfilter/xt_TCPMSS.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko:system/lib/modules/2.6.29-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko:system/lib/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko:system/lib/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/fs/ext4/ext4.ko:system/lib/modules/2.6.29-Kalim/kernel/fs/ext4/ext4.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/fs/jbd2/jbd2.ko:system/lib/modules/2.6.29-Kalim/kernel/fs/jbd2/jbd2.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/crypto/deflate.ko:system/lib/modules/2.6.29-Kalim/kernel/crypto/deflate.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/kernel/lib/crc16.ko:system/lib/modules/2.6.29-Kalim/kernel/lib/crc16.ko \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.order:system/lib/modules/2.6.29-Kalim/modules.order \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.devname:system/lib/modules/2.6.29-Kalim/modules.devname \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.alias.bin:system/lib/modules/2.6.29-Kalim/modules.alias.bin \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.symbols.bin:system/lib/modules/2.6.29-Kalim/modules.symbols.bin \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.inputmap:system/lib/modules/2.6.29-Kalim/modules.inputmap \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.dep:system/lib/modules/2.6.29-Kalim/modules.dep \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.dep.bin:system/lib/modules/2.6.29-Kalim/modules.dep.bin \ - device/htc/tattoo/custom/modules/2.6.29-Kalim/modules.softdep:system/lib/modules/2.6.29-Kalim/modules.softdep \ - device/htc/tattoo/custom/modules/wlan.ko:system/lib/modules/wlan.ko + device/htc/click/custom/modules/2.6.29-Kalim/modules.dep:system/lib/modules/2.6.29-Kalim/modules.dep \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.usbmap:system/lib/modules/2.6.29-Kalim/modules.usbmap \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.devname:system/lib/modules/2.6.29-Kalim/modules.devname \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko:system/lib/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko:system/lib/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/lib/crc16.ko:system/lib/modules/2.6.29-Kalim/kernel/lib/crc16.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/fs/jbd2/jbd2.ko:system/lib/modules/2.6.29-Kalim/kernel/fs/jbd2/jbd2.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/fs/ext4/ext4.ko:system/lib/modules/2.6.29-Kalim/kernel/fs/ext4/ext4.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/crypto/deflate.ko:system/lib/modules/2.6.29-Kalim/kernel/crypto/deflate.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko:system/lib/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko:system/lib/modules/2.6.29-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/kernel/net/netfilter/xt_TCPMSS.ko:system/lib/modules/2.6.29-Kalim/kernel/net/netfilter/xt_TCPMSS.ko \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.order:system/lib/modules/2.6.29-Kalim/modules.order \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.inputmap:system/lib/modules/2.6.29-Kalim/modules.inputmap \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.ofmap:system/lib/modules/2.6.29-Kalim/modules.ofmap \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.pcimap:system/lib/modules/2.6.29-Kalim/modules.pcimap \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.ccwmap:system/lib/modules/2.6.29-Kalim/modules.ccwmap \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.seriomap:system/lib/modules/2.6.29-Kalim/modules.seriomap \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.symbols:system/lib/modules/2.6.29-Kalim/modules.symbols \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.ieee1394map:system/lib/modules/2.6.29-Kalim/modules.ieee1394map \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.softdep:system/lib/modules/2.6.29-Kalim/modules.softdep \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.isapnpmap:system/lib/modules/2.6.29-Kalim/modules.isapnpmap \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.dep.bin:system/lib/modules/2.6.29-Kalim/modules.dep.bin \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.symbols.bin:system/lib/modules/2.6.29-Kalim/modules.symbols.bin \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.alias.bin:system/lib/modules/2.6.29-Kalim/modules.alias.bin \ + device/htc/click/custom/modules/2.6.29-Kalim/modules.alias:system/lib/modules/2.6.29-Kalim/modules.alias \ + device/htc/click/custom/modules/wlan.ko:system/lib/modules/wlan.ko diff --git a/bahamas-keypad.kcm b/bahamas-keypad.kcm deleted file mode 100644 index 2f9af21..0000000 --- a/bahamas-keypad.kcm +++ /dev/null @@ -1,64 +0,0 @@ -[type=QWERTY] - -# keycode display number base caps fn caps_fn - -A 'A' '2' 'a' 'A' 'a' 'A' -B 'B' '2' 'b' 'B' 'b' 'B' -C 'C' '2' 'c' 'C' 'c' 0x00E7 -D 'D' '3' 'd' 'D' ''' 0x00 -E 'E' '3' 'e' 'E' '"' 0x0301 -F 'F' '3' 'f' 'F' '[' 0x00A5 -G 'G' '4' 'g' 'G' ']' '_' -H 'H' '4' 'h' 'H' '<' '{' -I 'I' '4' 'i' 'I' '-' 0x0302 -J 'J' '5' 'j' 'J' '>' '}' -K 'K' '5' 'k' 'K' ';' '~' -L 'L' '5' 'l' 'L' ':' '`' -M 'M' '6' 'm' 'M' '!' 0x00 -N 'N' '6' 'n' 'N' 'n' 0x0303 -O 'O' '6' 'o' 'O' '+' 0x00 -P 'P' '7' 'p' 'P' '=' 0x00 -Q 'Q' '7' 'q' 'Q' '|' 0x0300 -R 'R' '7' 'r' 'R' '`' 0x20AC -S 'S' '7' 's' 'S' '\' 0x00DF -T 'T' '8' 't' 'T' '{' 0x00A3 -U 'U' '8' 'u' 'U' '_' 0x0308 -V 'V' '8' 'v' 'V' 'v' 'V' -W 'W' '9' 'w' 'W' '~' 0x00 -X 'X' '9' 'x' 'X' 'x' 0xEF00 -Y 'Y' '9' 'y' 'Y' '}' 0x00A1 -Z 'Z' '9' 'z' 'Z' 'z' 'Z' - -# on pc keyboards -COMMA ',' ',' ',' ',' ',' ',' -PERIOD '.' '.' '.' '.' '.' 0x2026 -AT '@' 0x00 '@' '@' '@' 0x2022 -SLASH '/' '/' '/' '?' '?' '\' - -SPACE 0x20 0x20 0x20 0x20 0xEF01 0xEF01 -ENTER 0xa 0xa 0xa 0xa 0xa 0xa - -TAB 0x9 0x9 0x9 0x9 0x9 0x9 -0 '0' '0' '0' ')' ')' ')' -1 '1' '1' '1' '!' '!' '!' -2 '2' '2' '2' '"' '"' '"' -3 '3' '3' '3' '#' '#' '#' -4 '4' '4' '4' '$' '$' '$' -5 '5' '5' '5' '%' '%' '%' -6 '6' '6' '6' '^' '^' '^' -7 '7' '7' '7' '&' '&' '&' -8 '8' '8' '8' '*' '*' '*' -9 '9' '9' '9' '(' '(' '(' -GRAVE '`' '`' '`' '~' '`' '~' -MINUS '-' '-' '-' '_' '-' '_' -EQUALS '=' '=' '=' '+' '=' '+' -LEFT_BRACKET '[' '[' '[' '{' '[' '{' -RIGHT_BRACKET ']' ']' ']' '}' ']' '}' -BACKSLASH '\' '\' '\' '|' '\' '|' -SEMICOLON ';' ';' ';' ':' ';' ':' -APOSTROPHE ''' ''' ''' '"' ''' '"' -STAR '*' '*' '*' '*' '*' '*' -POUND '#' '#' '#' '#' '#' '#' -PLUS '+' '+' '+' '+' '+' '+' - - diff --git a/click-vendor-blobs.mk b/click-vendor-blobs.mk new file mode 100644 index 0000000..e8a652e --- /dev/null +++ b/click-vendor-blobs.mk @@ -0,0 +1,69 @@ +# libgps is necessary to complete the compilation +PRODUCT_COPY_FILES += \ + device/htc/click/proprietary/libgps.so:obj/lib/libgps.so \ + device/htc/click/custom/logo.rle:root/logo.rle + +# proprietary for modules +$(call inherit-product, device/htc/click/KernelModules.mk) + +PRODUCT_COPY_FILES += \ + device/htc/click/custom/backuptool.sh:system/bin/backuptool.sh + +# proprietary for etc +PRODUCT_COPY_FILES += \ + device/htc/click/custom/10calibrate_screen:system/etc/init.d/10calibrate_screen \ + device/htc/click/custom/sysctl.conf:system/etc/sysctl.conf + +# click Calibration and other apps +PRODUCT_COPY_FILES += \ + device/htc/click/proprietary/app/HTCCalibrate.apk:system/app/HTCCalibrate.apk + +# proprietary for /system/bin +PRODUCT_COPY_FILES += \ + device/htc/click/custom/compcache:system/bin/compcache \ + device/htc/click/custom/rzscontrol:system/bin/rzscontrol + +# Other bin stuff +PRODUCT_COPY_FILES += \ + device/htc/click/proprietary/akm8973:system/bin/akm8973 + +# psfreedom files +PRODUCT_COPY_FILES += \ + device/htc/click/custom/modules.recovery/psfreedom.ko:recovery/root/res/modules/psfreedom.ko + +# proprietary stuff +PRODUCT_COPY_FILES += \ + device/htc/click/proprietary/AudioPara4.csv:system/etc/AudioPara4.csv \ + device/htc/click/proprietary/AudioFilter.csv:system/etc/AudioFilter.csv \ + device/htc/click/proprietary/AudioPreProcess.csv:system/etc/AudioPreProcess.csv \ + device/htc/click/proprietary/liboemcamera.so:system/lib/liboemcamera.so \ + device/htc/click/proprietary/libmmcamera.so:system/lib/libmmcamera.so \ + device/htc/click/proprietary/libmm-qcamera-tgt.so:system/lib/libmm-qcamera-tgt.so \ + device/htc/click/proprietary/libmmjpeg.so:system/lib/libmmjpeg.so \ + device/htc/click/proprietary/libaudioeq.so:system/lib/libaudioeq.so \ + device/htc/click/proprietary/libqcamera.so:system/lib/libqcamera.so \ + device/htc/click/proprietary/libmm-adspsvc.so:system/lib/libmm-adspsvc.so \ + device/htc/click/proprietary/libGLES_qcom.so:system/lib/egl/libGLES_qcom.so \ + device/htc/click/proprietary/libgps.so:system/lib/libgps.so \ + device/htc/click/proprietary/libOmxH264Dec.so:system/lib/libOmxH264Dec.so \ + device/htc/click/proprietary/libOmxMpeg4Dec.so:system/lib/libOmxMpeg4Dec.so \ + device/htc/click/proprietary/libOmxVidEnc.so:system/lib/libOmxVidEnc.so \ + device/htc/click/proprietary/libmm-adspsvc.so:system/lib/libmm-adspsvc.so \ + device/htc/click/proprietary/libhtc_acoustic.so:system/lib/libhtc_acoustic.so \ + device/htc/click/proprietary/libhtc_ril.so:system/lib/libhtc_ril.so \ + device/htc/click/keylayout/bahamas-keypad.kl:system/usr/keylayout/bahamas-keypad.kl \ + device/htc/click/keylayout/h2w_headset.kl:system/usr/keylayout/h2w_headset.kl \ + device/htc/click/keylayout/qwerty.kl:system/usr/keylayout/qwerty.kl \ + device/htc/click/firmware/Fw1251r1c.bin:system/etc/wifi/Fw1251r1c.bin \ + device/htc/click/firmware/brf6300.bin:system/etc/firmware/brf6300.bin \ + device/htc/click/firmware/brf6350.bin:system/etc/firmware/brf6350.bin + +ifdef WITH_WINDOWS_MEDIA +PRODUCT_COPY_FILES += \ + device/htc/click/proprietary/libomx_wmadec_sharedlibrary.so:system/lib/libomx_wmadec_sharedlibrary.so \ + device/htc/click/proprietary/libomx_wmvdec_sharedlibrary.so:system/lib/libomx_wmvdec_sharedlibrary.so \ + device/htc/click/proprietary/libpvasfcommon.so:system/lib/libpvasfcommon.so \ + device/htc/click/proprietary/libpvasflocalpbreg.so:system/lib/libpvasflocalpbreg.so \ + device/htc/click/proprietary/libpvasflocalpb.so:system/lib/libpvasflocalpb.so \ + device/htc/click/proprietary/pvasflocal.cfg:system/etc/pvasflocal.cfg +endif diff --git a/tattoo.mk b/click.mk similarity index 76% rename from tattoo.mk rename to click.mk index de1b1af..fa8400e 100644 --- a/tattoo.mk +++ b/click.mk @@ -14,7 +14,7 @@ # limitations under the License. # -DEVICE_PACKAGE_OVERLAYS += device/htc/tattoo/overlay +DEVICE_PACKAGE_OVERLAYS += device/htc/buzz/overlay # Live wallpaper packages PRODUCT_PACKAGES += \ @@ -24,13 +24,12 @@ PRODUCT_PACKAGES += \ # 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 \ - device/htc/tattoo/vold.fstab:system/etc/vold.fstab + device/htc/click/vold.fstab:system/etc/vold.fstab -$(call inherit-product, device/htc/tattoo/tattoo-vendor-blobs.mk) +$(call inherit-product, device/htc/click/click-vendor-blobs.mk) PRODUCT_PACKAGES += \ librs_jni \ - bahamas-keypad.kcm \ sensors.bahamas \ lights.bahamas \ copybit.bahamas \ @@ -38,6 +37,7 @@ PRODUCT_PACKAGES += \ gps.bahamas \ libOmxCore \ libmm-omxcore \ + libOmxVidEnc \ wlan_loader \ tiwlan.ini \ libcamera \ @@ -45,8 +45,8 @@ PRODUCT_PACKAGES += \ dhcpcd.conf PRODUCT_COPY_FILES += \ - device/htc/tattoo/init.bahamas.rc:root/init.bahamas.rc \ - device/htc/tattoo/ueventd.bahamas.rc:root/ueventd.bahamas.rc + device/htc/click/init.bahamas.rc:root/init.bahamas.rc \ + device/htc/click/ueventd.bahamas.rc:root/ueventd.bahamas.rc # Add normal Gallery PRODUCT_PACKAGES += Gallery @@ -59,6 +59,16 @@ PRODUCT_COPY_FILES += \ frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \ frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml +# keychars and keylayout files +PRODUCT_COPY_FILES += \ + device/htc/click/keychars/bahamas-keypad.kcm.bin:system/usr/keychars/bahamas-keypad.kcm.bin \ + device/htc/click/keychars/qwerty.kcm.bin:system/usr/keychars/qwerty.kcm.bin \ + device/htc/click/keychars/qwerty2.kcm.bin:system/usr/keychars/qwerty2.kcm.bin \ + device/htc/click/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \ + device/htc/click/keylayout/bahamas-keypad.kl:system/usr/keylayout/bahamas-keypad.kl \ + device/htc/click/keylayout/h2w_headset.kl:system/usr/keylayout/h2w_headset.kl \ + device/htc/click/keylayout/qwerty.kl:system/usr/keylayout/qwerty.kl + PRODUCT_PROPERTY_OVERRIDES += \ ro.media.dec.jpeg.memcap=10000000 @@ -101,9 +111,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # 0 => WCDMA Preferred. PRODUCT_PROPERTY_OVERRIDES += \ ro.telephony.default_network=0 \ - ro.com.android.dataroaming=false \ - ro.com.google.locationfeatures=1 \ - keyguard.no_require_sim=true + ro.com.google.locationfeatures=1 PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.hw=1 \ @@ -130,13 +138,17 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.compcache.default=18 +# Makes HOME ADW / OTHERS to be always in memoory +PRODUCT_PROPERTY_OVERRIDES += \ + pref_lock_home=1 + # media configuration xml file PRODUCT_COPY_FILES += \ - device/htc/tattoo/media_profiles.xml:/system/etc/media_profiles.xml + device/htc/click/media_profiles.xml:/system/etc/media_profiles.xml # Kernel Targets ifeq ($(TARGET_PREBUILT_KERNEL),) -LOCAL_KERNEL := device/htc/tattoo/custom/kernel +LOCAL_KERNEL := device/htc/click/custom/kernel else LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) endif @@ -148,5 +160,5 @@ $(call inherit-product, device/common/gps/gps_eu_supl.mk) $(call inherit-product, device/htc/common/common.mk) $(call inherit-product, build/target/product/full_base.mk) -PRODUCT_NAME := htc_tattoo -PRODUCT_DEVICE := tattoo +PRODUCT_NAME := htc_click +PRODUCT_DEVICE := click diff --git a/custom/app/HTCCalibrate.apk b/custom/app/HTCCalibrate.apk deleted file mode 100644 index 5e71fd5..0000000 Binary files a/custom/app/HTCCalibrate.apk and /dev/null differ diff --git a/custom/backuptool.sh b/custom/backuptool.sh index f417e4f..98623c1 100644 --- a/custom/backuptool.sh +++ b/custom/backuptool.sh @@ -5,7 +5,7 @@ C=/tmp/backupdir S=/system -V=KalimAz +V=nFinityGB-0 PROCEED=1; @@ -18,7 +18,7 @@ check_prereq() { } check_installscript() { - if [ -f "/tmp/.installscript" ]; + if [ -f "/tmp/.installscript" -a ! -f "$S/etc/force_backuptool" ]; then echo "/tmp/.installscript found. Skipping backuptool." PROCEED=0; @@ -70,6 +70,7 @@ lib/libspeech.so lib/libvoicesearch.so etc/hosts etc/custom_backup_list.txt +etc/force_backuptool EOF } diff --git a/custom/kernel b/custom/kernel old mode 100755 new mode 100644 index dbc0799..8262446 Binary files a/custom/kernel and b/custom/kernel differ diff --git a/custom/modules/2.6.29-Kalim/kernel/crypto/deflate.ko b/custom/modules/2.6.29-Kalim/kernel/crypto/deflate.ko index d706035..c1516c4 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/crypto/deflate.ko and b/custom/modules/2.6.29-Kalim/kernel/crypto/deflate.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko b/custom/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko index dce2c9b..e86191e 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko and b/custom/modules/2.6.29-Kalim/kernel/drivers/hid/hid-dummy.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko b/custom/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko index e850b0a..58cc4c5 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko and b/custom/modules/2.6.29-Kalim/kernel/drivers/staging/ramzswap/ramzswap.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/fs/ext4/ext4.ko b/custom/modules/2.6.29-Kalim/kernel/fs/ext4/ext4.ko index 08388b2..b919ac5 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/fs/ext4/ext4.ko and b/custom/modules/2.6.29-Kalim/kernel/fs/ext4/ext4.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/fs/jbd2/jbd2.ko b/custom/modules/2.6.29-Kalim/kernel/fs/jbd2/jbd2.ko index 34ec8b9..5ad791d 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/fs/jbd2/jbd2.ko and b/custom/modules/2.6.29-Kalim/kernel/fs/jbd2/jbd2.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/lib/crc16.ko b/custom/modules/2.6.29-Kalim/kernel/lib/crc16.ko index 05f3319..b1de1f0 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/lib/crc16.ko and b/custom/modules/2.6.29-Kalim/kernel/lib/crc16.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko index 7441b8b..7bd936a 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv4/tunnel4.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko index 3e73352..e1be94e 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ah6.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko index 66e66ca..314e170 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/esp6.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko index dd12008..cdcb861 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ip6_tunnel.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko index 49ca0f6..3c1afe7 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipcomp6.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko index 193c3b5..8ff3d68 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/ipv6.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko index bdd8bf9..4f4f3ba 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/mip6.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko index ab7c791..a64f5c1 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/sit.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko index 7dd3f4d..f28574a 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/tunnel6.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko index 27ad54c..6148a60 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_beet.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko index 589e25a..23f02ce 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_ro.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko index 2339996..816550c 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_transport.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko index ef3452d..6815f97 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_mode_tunnel.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko index 46b1aaa..685fd89 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko and b/custom/modules/2.6.29-Kalim/kernel/net/ipv6/xfrm6_tunnel.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/netfilter/xt_TCPMSS.ko b/custom/modules/2.6.29-Kalim/kernel/net/netfilter/xt_TCPMSS.ko index 0702123..1119256 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/netfilter/xt_TCPMSS.ko and b/custom/modules/2.6.29-Kalim/kernel/net/netfilter/xt_TCPMSS.ko differ diff --git a/custom/modules/2.6.29-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko b/custom/modules/2.6.29-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko index f9a2210..b8532f4 100644 Binary files a/custom/modules/2.6.29-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko and b/custom/modules/2.6.29-Kalim/kernel/net/xfrm/xfrm_ipcomp.ko differ diff --git a/custom/modules/2.6.29-Kalim/source b/custom/modules/2.6.29-Kalim/source index 4915cd6..4322856 120000 --- a/custom/modules/2.6.29-Kalim/source +++ b/custom/modules/2.6.29-Kalim/source @@ -1 +1 @@ -/home/calimochoazucarado/android/Enviado_a_GITHUB/kernel.kalimochoAz \ No newline at end of file +/home/kalimochoaz/android/kernel.kalimochoAz \ No newline at end of file diff --git a/custom/modules/wlan.ko b/custom/modules/wlan.ko index aad7fff..24e3d6b 100644 Binary files a/custom/modules/wlan.ko and b/custom/modules/wlan.ko differ diff --git a/custom/recovery_kernel b/custom/recovery_kernel old mode 100755 new mode 100644 diff --git a/init.bahamas.rc b/init.bahamas.rc index bba27b4..e4fa992 100644 --- a/init.bahamas.rc +++ b/init.bahamas.rc @@ -27,6 +27,7 @@ on boot chown bluetooth bluetooth /sys/class/rfkill/rfkill0/type chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state chmod 0660 /sys/class/rfkill/rfkill0/state + chown system system /dev/ttyHSUSB0 # Permissions for Liblights. chown system system /sys/class/leds/green/brightness @@ -43,6 +44,11 @@ on boot write /sys/devices/system/cpu/cpu0/cpufreq/ondemand/sampling_rate 40000 write /sys/devices/system/cpu/cpu0/cpufreq/ondemand/up_threshold 85 + # performance tweaks for flash + write /sys/block/mtdblock3/bdi/read_ahead_kb 4 + write /sys/block/mtdblock4/bdi/read_ahead_kb 4 + write /sys/block/mtdblock5/bdi/read_ahead_kb 4 + # compass/accelerometer daemon service akm8973 /system/bin/akm8973 user compass diff --git a/keychars/bahamas-keypad.kcm.bin b/keychars/bahamas-keypad.kcm.bin new file mode 100644 index 0000000..180374f Binary files /dev/null and b/keychars/bahamas-keypad.kcm.bin differ diff --git a/keylayout/AVRCP.kl b/keylayout/AVRCP.kl new file mode 100644 index 0000000..d0eba10 --- /dev/null +++ b/keylayout/AVRCP.kl @@ -0,0 +1,6 @@ +key 164 MEDIA_PLAY_PAUSE WAKE +key 128 MEDIA_STOP WAKE +key 163 MEDIA_NEXT WAKE +key 165 MEDIA_PREVIOUS WAKE +key 168 MEDIA_REWIND WAKE +key 159 MEDIA_FAST_FORWARD WAKE diff --git a/libcamera/Android.mk b/libcamera/Android.mk index 36ec046..4e1c60a 100644 --- a/libcamera/Android.mk +++ b/libcamera/Android.mk @@ -1,6 +1,4 @@ -BOARD_USES_OLD_CAMERA_HACK:=true - -ifeq ($(BOARD_USES_OLD_CAMERA_HACK),true) +ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),bahamas) BUILD_LIBCAMERA:= true ifeq ($(BUILD_LIBCAMERA),true) diff --git a/media_profiles.xml b/media_profiles.xml index 84008c6..c3b4c92 100644 --- a/media_profiles.xml +++ b/media_profiles.xml @@ -79,25 +79,25 @@ - -