Cleanup (1/2)

BoardConfig.mk

@@ -59,18 +59,7 @@ TARGET_QCOM_AUDIO_VARIANT := caf
 BOARD_USES_OLD_QC_GPS := true
 
 # WiFi
-BOARD_WPA_SUPPLICANT_DRIVER := NL80211
-WPA_SUPPLICANT_VERSION := VER_0_8_X
-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_FW_PATH_STA := "/system/vendor/firmware/fw_bcmdhd.bin"
-WIFI_DRIVER_FW_PATH_P2P := "/system/vendor/firmware/fw_bcmdhd_p2p.bin"
-WIFI_DRIVER_FW_PATH_AP := "/system/vendor/firmware/fw_bcmdhd_apsta.bin"
-BOARD_WLAN_DEVICE_REV            := bcm4330_b2
-BOARD_LEGACY_NL80211_STA_EVENTS := false
+BOARD_WLAN_DEVICE_REV := bcm4330_b2
 
 # Filesystem
 TARGET_USERIMAGES_USE_EXT4 := true

rootdir/etc/init.vigor.rc

@@ -161,7 +161,7 @@ on boot
     insmod /system/lib/modules/bcmdhd.ko
 
     # symlink for HDMI
-    symlink /dev/graphics/fb1 /dev/graphics/hdmi
+##    symlink /dev/graphics/fb1 /dev/graphics/hdmi
 
     # audio
     mkdir /data/audio 2770 media audio
@@ -252,10 +252,10 @@ service hciattach /system/bin/brcm_patchram_plus --no2bytes --enable_hci \
     disabled
     oneshot
 
-service hdmid /system/bin/hdmid
-    class main
-    socket hdmid stream 0660 root system graphics
-    disabled
+##service hdmid /system/bin/hdmid
+##    class main
+##    socket hdmid stream 0660 root system graphics
+##    disabled
 
 service htcbatt /system/bin/htcbatt
     class main
@@ -324,11 +324,6 @@ service qmiproxy /system/bin/qmiproxy
     user radio
     group radio
 
-service qmuxd /system/bin/qmuxd
-    class main
-    user radio
-    group radio audio bluetooth gps
-
 service qmuxd /system/bin/qmuxd
     class late_start
     user radio
@@ -342,16 +337,11 @@ service rmt_storage /system/bin/rmt_storage /dev/block/mmcblk0p25 /dev/block/mmc
     class core
     user root
 
-service qcamerasvr /system/bin/mm-qcamera-daemon
-    class main
-    user system
-    group system camera inet
-
 on property:init.svc.bootanim=stopped
     start qcom-post-boot
 
-on property:ro.hdmi.enable=true
-    start hdmid
+##on property:ro.hdmi.enable=true
+##    start hdmid
 
 on property:service.adb.root=1
     write /sys/class/android_usb/android0/enable 0
@@ -371,4 +361,4 @@ service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard1
 
 service fuse_usbdisk /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/usbdisk /storage/usbdisk
     class late_start
-    disabled
+    disabled

system.prop

@@ -42,8 +42,8 @@ ro.telephony.default_cdma_sub=0
 
 # cm qcom configs
 com.qc.hardware = true
-com.qc.hdmi_out = true
-ro.hdmi.enable = true
+##com.qc.hdmi_out = true
+##ro.hdmi.enable = true
 
 # qcom cpu governor service
 dev.pm.dyn_samplingrate = 1
@@ -107,9 +107,6 @@ ro.ril.hsxpa = 3
 # For HSDPA low throughput
 ro.ril.disable.power.collapse = 1
 
-#system props for time-services
-persist.timed.enable = true
-
 # For the default value of agps
 ro.ril.def.agps.mode = 6
 

vigor.mk

@@ -43,19 +43,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.com.google.locationfeatures=1 \
     ro.setupwizard.enable_bypass=1 \
     dalvik.vm.lockprof.threshold=500 \
-    dalvik.vm.dexopt-flags=m=y
-
-# Permissions
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \
-    frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
-    frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
-    frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
-
-# Audio/Video codecs
-PRODUCT_COPY_FILES += \
-    device/htc/msm8660-common/configs/media_codecs.xml:system/etc/media_codecs.xml \
-    device/htc/msm8660-common/configs/media_profiles.xml:system/etc/media_profiles.xml
+    dalvik.vm.dexopt-flag=o=v,m=y
 
 # HTC BT Audio tune
 PRODUCT_COPY_FILES += device/htc/vigor/dsp/AudioBTID.csv:system/etc/AudioBTID.csv
@@ -111,37 +99,15 @@ PRODUCT_COPY_FILES += \
 # Graphics
 PRODUCT_COPY_FILES += device/htc/vigor/configs/adreno_config.txt:system/etc/adreno_config.txt
 
-# QC thermald config
-PRODUCT_COPY_FILES += device/htc/vigor/prebuilt/thermald.conf:system/etc/thermald.conf
-
-# Wifi
-PRODUCT_COPY_FILES += \
-    device/htc/vigor/configs/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
-    device/htc/vigor/configs/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf
-
 PRODUCT_PROPERTY_OVERRIDES := \
-wifi.interface=wlan0 \
-
-BOARD_WLAN_DEVICE_REV := bcm4330_b2
-WIFI_BAND := 802_11_ABG
+    wifi.interface=wlan0 \
+    wifi.supplicant_scan_interval=120
 
 # Bluetooth firmware
 $(call inherit-product, device/htc/msm8660-common/bcm_hcd.mk)
 $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk)
 
-# We have enough storage space to hold precise GC data
-PRODUCT_TAGS += dalvik.gc.type-precise
-
-# Device uses high-density artwork where available
-PRODUCT_AAPT_CONFIG := normal hdpi xhdpi
-PRODUCT_AAPT_PREF_CONFIG := xhdpi
-PRODUCT_LOCALES += en_US
-
 # Inherit configs
 $(call inherit-product-if-exists, vendor/htc/vigor/vigor-vendor.mk)
 $(call inherit-product, device/htc/msm8660-common/msm8660.mk)
 $(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
-$(call inherit-product, build/target/product/full_base_telephony.mk)
-
-ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
-ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=0