stuff

Android.mk

@@ -1,4 +1,4 @@
 
 ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),u8815)
-include $(call all-named-subdir-makefiles, liblights libaudio libril)
+include $(call all-named-subdir-makefiles, liblights libgralloc libcopybit)
 endif

BoardConfig.mk

@@ -1,11 +1,11 @@
-USE_CAMERA_STUB := false
+USE_CAMERA_STUB := true
 
 # inherit from the proprietary version
 -include vendor/huawei/u8815/BoardConfigVendor.mk
 
 TARGET_NO_BOOTLOADER := true
 
-TARGET_BOARD_PLATFORM := msm7x27
+TARGET_BOARD_PLATFORM := msm7k
 TARGET_BOARD_PLATFORM_GPU := qcom-adreno200
 
 TARGET_NO_BOOTLOADER := true
@@ -17,7 +17,7 @@ TARGET_ARCH_VARIANT := armv7-a-neon
 ARCH_ARM_HAVE_TLS_REGISTER := true
 
 TARGET_BOOTLOADER_BOARD_NAME := u8815
-TARGET_OTA_ASSERT_DEVICE := u8815,hwu8815,u8815,hwu8815
+TARGET_OTA_ASSERT_DEVICE := u8815,hwu8815,u8818,hwu8818
 
 # Audio
 BOARD_PROVIDES_LIBAUDIO := true
@@ -40,7 +40,8 @@ BOARD_USES_QCOM_HARDWARE := true
 COMMON_GLOBAL_CFLAGS += -DQCOM_HARDWARE
 BOARD_USES_QCOM_LIBRPC := true
 BOARD_USES_QCOM_LIBS := true
-COMMON_GLOBAL_CFLAGS += -DTARGET_MSM7x27
+COMMON_GLOBAL_CFLAGS += -DTARGET_MSM7x27A -DTARGET_MSM7x27
+TARGET_LIBAGL_USE_GRALLOC_COPYBITS := true
 
 WITH_JIT := true
 ENABLE_JSC_JIT := true
@@ -50,10 +51,6 @@ HTTP := chrome
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
 
-# FM Radio
-BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO
-FM_RADIO := true
-
 # RIL
 BOARD_PROVIDES_LIBRIL := true
 
@@ -79,7 +76,7 @@ BOARD_FLASH_BLOCK_SIZE := 131072
 #TARGET_KERNEL_SOURCE := kernel/huawei/u8815
 #TARGET_KERNEL_CONFIG := cyanogen_u8815_defconfig
 TARGET_PREBUILT_KERNEL := device/huawei/u8815/kernel
-BOARD_KERNEL_CMDLINE := console=ttyDDC0 androidboot.hardware=huawei
+BOARD_KERNEL_CMDLINE := androidboot.hardware=huawei
 BOARD_KERNEL_BASE := 0x00200000
 BOARD_PAGE_SIZE := 2048
 
@@ -96,8 +93,6 @@ BOARD_CACHE_FILESYSTEM_OPTIONS := rw
 BOARD_USES_MMCUTILS := true
 BOARD_HAS_NO_MISC_PARTITION := true
 
-BOARD_CUSTOM_GRAPHICS := ../../../device/huawei/u8815/recovery/graphics.c
-BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/huawei/u8815/recovery/recovery_ui.c
 BOARD_USE_USB_MASS_STORAGE_SWITCH := true
 TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/devices/platform/usb_mass_storage/lun
 TARGET_USE_CUSTOM_SECOND_LUN_NUM := 2

device_u8815.mk

@@ -33,11 +33,8 @@ PRODUCT_PACKAGES += \
 
 # Graphics 
 PRODUCT_PACKAGES += \
-    gralloc.msm7x27 \
-    copybit.msm7x27 \
-    hwcomposer.msm7x27 \
-    libtilerenderer \
-    libQcomUI
+    gralloc.u8815 \
+    copybit.u8815
 
 # Audio
 PRODUCT_PACKAGES += \
@@ -77,6 +74,7 @@ PRODUCT_COPY_FILES += \
     device/huawei/u8815/prebuilt/system/wifi/fw_4330_b2.bin:system/wifi/fw_4330_b2.bin \
     device/huawei/u8815/prebuilt/system/wifi/nvram_4330.txt:system/wifi/nvram_4330.txt \
     device/huawei/u8815/prebuilt/system/etc/wifi/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf
+
 PRODUCT_COPY_FILES += \
     device/huawei/u8815/prebuilt/system/etc/bluetooth/BCM4330.hcd:system/etc/bluetooth/BCM4330.hcd \
     device/huawei/u8815/prebuilt/system/etc/bluetooth/init.bcm.bt.sh:system/etc/bluetooth/init.bcm.bt.sh \
@@ -91,13 +89,8 @@ PRODUCT_COPY_FILES += \
     device/huawei/u8815/prebuilt/system/etc/init.qcom.post_boot.sh:system/etc/init.qcom.post_boot.sh \
     device/huawei/u8815/prebuilt/system/etc/init.qcom.sdio.sh:system/etc/init.qcom.sdio.sh \
     device/huawei/u8815/prebuilt/system/etc/vold.fstab:system/etc/vold.fstab \
-    device/huawei/u8815/mediaprofiles/media_profiles.xml:system/etc/media_profiles.xml \
     device/huawei/u8815/prebuilt/system/etc/AutoVolumeControl.txt:system/etc/AutoVolumeControl.txt
 
-PRODUCT_COPY_FILES += \
-    device/huawei/u8815/prebuilt/system/etc/firmware/yamato_pfp.fw:system/etc/firmware/yamato_pfp.fw \
-    device/huawei/u8815/prebuilt/system/etc/firmware/yamato_pm4.fw:system/etc/firmware/yamato_pm4.fw
-
 PRODUCT_COPY_FILES += \
     device/huawei/u8815/prebuilt/system/usr/idc/synaptics.idc:system/usr/idc/synaptics.idc \
     device/huawei/u8815/prebuilt/system/usr/keychars/7x27a_kp.kcm:system/usr/keychars/7x27a_kp.kcm \
@@ -106,21 +99,9 @@ PRODUCT_COPY_FILES += \
     device/huawei/u8815/prebuilt/system/usr/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \
     device/huawei/u8815/prebuilt/system/usr/keylayout/Generic.kl:system/usr/keylayout/Generic.kl \
     device/huawei/u8815/prebuilt/system/usr/keylayout/surf_keypad.kl:system/usr/keylayout/surf_keypad.kl
-
-PRODUCT_COPY_FILES += \
-    device/huawei/u8815/prebuilt/system/lib/egl/libq3dtools_adreno200.so:system/lib/egl/libq3dtools_adreno200.so \
-    device/huawei/u8815/prebuilt/system/lib/egl/libGLESv2_adreno200.so:system/lib/egl/libGLESv2_adreno200.so \
-    device/huawei/u8815/prebuilt/system/lib/egl/libGLESv1_CM_adreno200.so:system/lib/egl/libGLESv1_CM_adreno200.so \
-    device/huawei/u8815/prebuilt/system/lib/egl/libEGL_adreno200.so:system/lib/egl/libEGL_adreno200.so \
-    device/huawei/u8815/prebuilt/system/lib/egl/eglsubAndroid.so:system/lib/egl/eglsubAndroid.so \
-    device/huawei/u8815/prebuilt/system/lib/libC2D2.so:system/lib/libC2D2.so \
-    device/huawei/u8815/prebuilt/system/lib/libOpenVG.so:system/lib/libOpenVG.so \
-    device/huawei/u8815/prebuilt/system/lib/libsc-a2xx.so:system/lib/libsc-a2xx.so \
-    device/huawei/u8815/prebuilt/system/lib/libgsl.so:system/lib/libgsl.so
 
 PRODUCT_COPY_FILES += \
-    vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml \
-    device/huawei/u8815/prebuilt/system/bin/vold:system/bin/vold
+    vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
 
 PRODUCT_LOCALES += hdpi