Cm 10.1

BoardConfig.mk

@@ -30,12 +30,11 @@ USE_CAMERA_STUB := false
 # inherit common defines for all qsd8k devices
 include device/htc/qsd8k-common/BoardConfigCommon.mk
 
-# Override qsd8k-common/BoardConfigCommon.mk to use incredikernel
-TARGET_KERNEL_SOURCE := kernel/htc/incredikernel
-# Override kernel toolchain. (4.6 is too unstable)
-#KERNEL_TOOLCHAIN_PREFIX:=$(ANDROID_BUILD_TOP)/prebuilts/gcc/toolchain/arm-eabi-4.4.3/bin/arm-eabi-
-# Use Linaro 4.7 toolchain
-KERNEL_TOOLCHAIN_PREFIX:=$(ANDROID_BUILD_TOP)/prebuilts/gcc/linux-x86/arm/linaro-4.7/bin/arm-eabi-
+# Override qsd8k-common/BoardConfigCommon.mk to use evervolv
+#TARGET_KERNEL_SOURCE := kernel/htc/incredikernel
+
+# Use GCC 4.7 toolchain
+KERNEL_TOOLCHAIN_PREFIX:=$(ANDROID_BUILD_TOP)/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7/bin/arm-eabi-
 
 TARGET_BOOTLOADER_BOARD_NAME := inc
 
@@ -44,6 +43,12 @@ BOARD_USE_LEGACY_TRACKPAD := true
 
 BOARD_HAS_SCREEN_OFF_FLICKER := true
 
+TARGET_ARCH_LOWMEM := true
+
+# RIL
+BOARD_USE_NEW_LIBRIL_HTC := true
+BOARD_USES_LEGACY_RIL := true
+
 BOARD_KERNEL_CMDLINE := no_console_suspend=1
 BOARD_KERNEL_BASE := 0x20000000
 BOARD_KERNEL_NEW_PPPOX := true
@@ -71,7 +76,7 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x09500000
 BOARD_FLASH_BLOCK_SIZE := 131072
 
 # Try to build the kernel
-TARGET_KERNEL_CONFIG    := incrediblec-incredikernel_defconfig
+TARGET_KERNEL_CONFIG    := evervolv_incrediblec_defconfig
 # Keep this as a fall back in case of no source
 TARGET_PREBUILT_KERNEL  := device/htc/inc/prebuilt/root/kernel
 

Manifest/local_manifest.xml

@@ -1,37 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="https://github.com/Evervolv/" name="ev" review="review.evervolv.com" />
-  <project name="android_device_htc_qsd8k-common" path="device/htc/qsd8k-common" remote="ev" revision="jellybean" />
-  <project name="tiny4579/android_device_htc_inc" path="device/htc/inc" revision="cm-10.1" />
-  <project name="tiny4579/android_kernel_common" path="kernel/htc/incredikernel" revision="incredikernel-jb42" />
-  <project name="PonsAsinorem/pseudo_buildbot" path="vendor/cm/bot" revision="jb" />
-  <project name="android_vendor_htc" path="vendor/htc" remote="ev" revision="jellybean" />
-  <remove-project name="CyanogenMod/android_frameworks_av" path="frameworks/av" />
-  <project name="android_frameworks_av" path="frameworks/av" remote="ev" revision="jellybean" />
-  <remove-project name="CyanogenMod/android_frameworks_native" path="frameworks/native" />
-  <project name="android_frameworks_native" path="frameworks/native" remote="ev" revision="jellybean" />
-  <project name="android_hardware_qcom_audio-legacy" path="hardware/qcom/audio-legacy" remote="ev" revision="jellybean" />
-  <project name="android_hardware_qcom_display-legacy" path="hardware/qcom/display-legacy" remote="ev" revision="jellybean" />
-  <remove-project name="CyanogenMod/android_hardware_qcom_gps" path="hardware/qcom/gps" />
-  <project name="android_hardware_qcom_gps" path="hardware/qcom/gps" remote="ev" revision="jellybean" />
-  <project name="android_hardware_qcom_gps-legacy" path="hardware/qcom/gps-legacy" remote="ev" revision="jellybean" />
-  <remove-project name="CyanogenMod/android_hardware_ril" path="hardware/ril" />
-  <project name="android_hardware_ril" path="hardware/ril" remote="ev" revision="jellybean" />
-  <remove-project name="CyanogenMod/android_vendor_cm" path="vendor/cm" />
-  <project name="tiny4579/android_vendor_cm" path="vendor/cm" revision="cm-10.1" />
-  <remove-project name="CyanogenMod/android_packages_apps_CMUpdater" path="packages/apps/CMUpdater" />
-  <remove-project name="CyanogenMod/android_packages_apps_CMWallpapers" path="packages/apps/CMWallpapers" />
-  <remove-project name="CyanogenMod/android_packages_apps_Music" path="packages/apps/Music" />
-  <remove-project name="CyanogenMod/android_packages_apps_MusicFX" path="packages/apps/MusicFX" />
-  <remove-project name="CyanogenMod/android_packages_apps_Nfc" path="packages/apps/Nfc" />
-  <remove-project name="CyanogenMod/android_packages_apps_Protips" path="packages/apps/Protips" />
-  <remove-project name="CyanogenMod/android_packages_apps_SoundRecorder" path="packages/apps/SoundRecorder" />
-  <remove-project name="CyanogenMod/android_packages_apps_SpareParts" path="packages/apps/SpareParts" />
-  <remove-project name="CyanogenMod/android_packages_apps_VideoEditor" path="packages/apps/VideoEditor" />
-  <remove-project name="CyanogenMod/android_packages_wallpapers_Basic" path="packages/wallpapers/Basic" />
-  <remove-project name="CyanogenMod/android_packages_wallpapers_Galaxy4" path="packages/wallpapers/Galaxy4" />
-  <remove-project name="CyanogenMod/android_packages_wallpapers_HoloSpiral" path="packages/wallpapers/HoloSpiral" />
-  <remove-project name="CyanogenMod/android_packages_wallpapers_MagicSmoke" path="packages/wallpapers/MagicSmoke" />
-  <remove-project name="CyanogenMod/android_packages_wallpapers_MusicVisualization" path="packages/wallpapers/MusicVisualization" />
-  <remove-project name="CyanogenMod/android_packages_wallpapers_NoiseField" path="packages/wallpapers/NoiseField" />
+
+  <remote  name="ev"
+           fetch="https://github.com/Evervolv/"
+           review="review.evervolv.com" />
+
+  <!--Added-->
+  <project path="device/htc/qsd8k-common" name="android_device_htc_qsd8k-common" remote="ev" revision="jellybean" />
+  <project path="device/htc/inc" name="PonsAsinorem/android_device_htc_inc" revision="cm-10.1" />
+  <project path="hardware/qcom/audio-legacy" name="android_hardware_qcom_audio-legacy" remote="ev" revision="jellybean" />
+  <project path="hardware/qcom/camera" name="android_hardware_qcom_camera" remote="ev" revision="jellybean" />
+  <project path="hardware/qcom/display-legacy" name="android_hardware_qcom_display-legacy" remote="ev" revision="jellybean" />
+  <!--project path="kernel/htc/incredikernel" name="PonsAsinorem/android_kernel_common" revision="incredikernel-jb42" /-->
+  <project path="kernel/htc/evervolv" name="android_kernel_htc_qsd8k" remote="ev" revision="jellybean" />
+  <!--pseudo_buildbot is a WIP. You can leave it out-->
+  <!--project path="vendor/cm/bot" name="PonsAsinorem/pseudo_buildbot" revision="jb" /-->
+  <project path="vendor/htc" name="android_vendor_htc" remote="ev" revision="jellybean" />
+
+  <!--Replaced-->
+  <remove-project path="frameworks/av" name="CyanogenMod/android_frameworks_av" />
+  <project path="frameworks/av" name="android_frameworks_av" remote="ev" revision="jellybean" />
+
+  <remove-project path="frameworks/native" name="CyanogenMod/android_frameworks_native" />
+  <project path="frameworks/native" name="android_frameworks_native" remote="ev" revision="jellybean" />
+
+  <remove-project path="hardware/qcom/gps" name="CyanogenMod/android_hardware_qcom_gps" />
+  <project path="hardware/qcom/gps-legacy" name="android_hardware_qcom_gps-legacy" remote="ev" revision="jellybean" />
+
+  <remove-project path="hardware/ril" name="CyanogenMod/android_hardware_ril" />
+  <project path="hardware/ril" name="android_hardware_ril" remote="ev" revision="jellybean" />
+
+  <remove-project path="vendor/cm" name="CyanogenMod/android_vendor_cm" />
+  <project path="vendor/cm" name="PonsAsinorem/android_vendor_cm" revision="cm-10.1" />
+
+  <!--Removed-->
+  <remove-project path="packages/apps/CMUpdater" name="CyanogenMod/android_packages_apps_CMUpdater" />
+  <remove-project path="packages/apps/CMWallpapers" name="CyanogenMod/android_packages_apps_CMWallpapers" />
+  <remove-project path="packages/apps/Music" name="CyanogenMod/android_packages_apps_Music" />
+  <remove-project path="packages/apps/MusicFX" name="CyanogenMod/android_packages_apps_MusicFX" />
+  <remove-project path="packages/apps/Nfc" name="CyanogenMod/android_packages_apps_Nfc" />
+  <remove-project path="packages/apps/Protips" name="CyanogenMod/android_packages_apps_Protips" />
+  <remove-project path="packages/apps/SoundRecorder" name="CyanogenMod/android_packages_apps_SoundRecorder" />
+  <remove-project path="packages/apps/SpareParts" name="CyanogenMod/android_packages_apps_SpareParts" />
+  <remove-project path="packages/apps/VideoEditor" name="CyanogenMod/android_packages_apps_VideoEditor" />
+  <remove-project path="packages/wallpapers/Basic" name="CyanogenMod/android_packages_wallpapers_Basic" />
+  <remove-project path="packages/wallpapers/Galaxy4" name="CyanogenMod/android_packages_wallpapers_Galaxy4" />
+  <remove-project path="packages/wallpapers/HoloSpiral" name="CyanogenMod/android_packages_wallpapers_HoloSpiral" />
+  <remove-project path="packages/wallpapers/MagicSmoke" name="CyanogenMod/android_packages_wallpapers_MagicSmoke" />
+  <remove-project path="packages/wallpapers/MusicVisualization" name="CyanogenMod/android_packages_wallpapers_MusicVisualization" />
+  <remove-project path="packages/wallpapers/NoiseField" name="CyanogenMod/android_packages_wallpapers_NoiseField" />
+  <remove-project path="packages/wallpapers/PhaseBeam" name="CyanogenMod/android_packages_wallpapers_PhaseBeam" />
 </manifest>

README.md

@@ -1,4 +1,4 @@
-CM10.1 for the Droid Incredible
+CM10 for the Droid Incredible
 
 ## Info
 [**XDA Discussion thread**](http://forum.xda-developers.com/showthread.php?t=1882918)
@@ -13,12 +13,13 @@ mkdir ~/bin
 cd ~/android/cm10/
 curl https://dl-ssl.google.com/dl/googlesource/git-repo/repo > ~/bin/repo
 chmod a+x ~/bin/repo
-repo init -u git://github.com/CyanogenMod/android.git -b cm-10.1
+repo init -u git://github.com/CyanogenMod/android.git -b jellybean
 ```
 
 ### Finish setting up repo
 ```bash
-wget -O .repo/local_manifest/local_manifest.xml https://raw.github.com/tiny4579/android_device_htc_inc/cm-10.1/Manifest/local_manifest.xml
+mkdir ~/cm10/.repo/local_manifests
+wget -O ~/cm10/.repo/local_manifests https://raw.github.com/PonsAsinorem/android_device_htc_inc/cm-10.1/Manifest/local_manifest.xml
 ```
 
 ### Download the source
@@ -160,4 +161,4 @@ Whether you're using the optional cherry-picks and/or Linaro, pull in the prebui
 And build!
 ```bash
 . build/envsetup.sh && time brunch inc
-```
+```

cm.mk

@@ -22,4 +22,4 @@ PRODUCT_MODEL := ADR6300
 PRODUCT_MANUFACTURER := HTC
 
 #Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=inc BUILD_FINGERPRINT="verizon_wwe/inc/inc/inc:2.3.4/GRJ22/185897.2:user/release-keys" PRIVATE_BUILD_DESC="inc-user 4.2.1 JOP40D 228551 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=inc BUILD_FINGERPRINT="verizon_wwe/inc/inc/inc:2.3.4/GRJ22/185897.2:user/release-keys" PRIVATE_BUILD_DESC="inc-user 4.2.2 JDQ39 228551 release-keys"

full_inc.mk

@@ -114,9 +114,10 @@ PRODUCT_PACKAGES += \
 
 # USB
 ADDITIONAL_DEFAULT_PROPERTIES += \
-    persist.sys.usb.config=mass_storage,mtp \
+    persist.sys.usb.config=mass_storage \
     persist.service.adb.enable=1 \
-    ro.adb.secure=0
+    ro.adb.secure=1 \
+    ro.secure=0
 
 # Init post-boot script
 PRODUCT_COPY_FILES += \
@@ -147,12 +148,12 @@ PRODUCT_VERSION_MINOR := 1
 
 # Goo Manager support
 ifneq ($(CM_BUILDTYPE),UNOFFICIAL)
-    CM_BUILDTYPE := TINY
+    CM_BUILDTYPE := PONS
     CM_VERSION := $(PRODUCT_VERSION_MAJOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)-$(CM_BUILD)$(CM_EXTRAVERSION)
     PRODUCT_PROPERTY_OVERRIDES += \
         ro.modversion=CyanogenMod-$(CMVERSION) \
-        ro.goo.developerid=tiny4579 \
-        ro.goo.rom=CM$(PRODUCT_VERSION_MAJOR)$(PRODUCT_VERSION_MINOR)$(CM_BUILDTYPE)$(CM_BUILD) \
+        ro.goo.developerid=PonsAsinorem \
+        ro.goo.rom=CM$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)$(CM_BUILDTYPE)$(CM_BUILD) \
         ro.goo.version=$(shell date +%s)
 
     PRODUCT_COPY_FILES +=  \

overlay/frameworks/base/core/res/res/values/config.xml

@@ -177,7 +177,7 @@
     <integer-array name="config_tether_upstream_types">
         <item>0</item>
         <item>1</item>
-        <item>4</item>
+        <item>5</item>
         <item>7</item>
     </integer-array>
 
@@ -210,5 +210,17 @@
     <!-- Boolean indicating if restoring network selection should be skipped -->
     <!-- The restoring is handled by modem if it is true -->
     <bool translatable="false" name="skip_restoring_network_selection">true</bool>
+
+    <!-- Hardware 'face' keys present on the device, stored as a bit field.
+         This integer should equal the sum of the corresponding value for each
+         of the following keys present:
+             1 - Home
+             2 - Back
+             4 - Menu
+             8 - Assistant (search)
+             16 - App switch
+         For example, a device with Home, Back and Menu keys would set this
+         config to 7. --> 
+    <integer name="config_deviceHardwareKeys">15</integer>
 
 </resources>

prebuilt/etc/apns-conf.xml

@@ -1,28 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<apns version="7">
+<!-- use empty string to specify no proxy or port -->
+<!-- This version must agree with that in apps/common/res/apns.xml -->
+<apns version="8">
     <apn carrier="Verizon"
         mcc="310"
         mnc="004"
-        apn=""
-        user="*"
-        server="*"
-        password="*"
+        apn="internet"
+        type="default,mms,dun"
         mmsc="http://mms.vtext.com/servlets/mms"
+        protocol="IPV4V6"
+    />
+    <apn carrier="Verizon Internet"
+        mcc="310"
+        mnc="004"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+    />
+    <apn carrier="Verizon FOTA"
+        mcc="310"
+        mnc="004"
+        apn="VZWADMIN"
+        type="fota"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+    />
+    <apn carrier="Verizon IMS"
+        mcc="310"
+        mnc="004"
+        apn="VZWIMS"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+    />
+    <apn carrier="Verizon CBS"
+        mcc="310"
+        mnc="004"
+        apn="VZWAPP"
+        type="cbs,mms"
+        mmsc="http://mms.vtext.com/servlets/mms"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+    />
+
+    <!-- VZW CDMA -->
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="6"
+    />
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="7"
+    />
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="8"
+    />
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="12"
     />
-     <apn name="Production" 
-         numeric="310012"  
-         mcc="310" 
-         mnc="012"  
-         apn="1" 
-         user="null"  
-         server="null" 
-         password="null" 
-         proxy="null" 
-         port="" 
-         mmsproxy="" 
-         mmsport="" 
-         mmsprotocol="2.0" 
-         mmsc="http://mms.vtext.com/servlets/mms"  
-         type="mms" />
 </apns>

prebuilt/etc/media_profiles.xml

@@ -77,7 +77,7 @@
 -->
 <MediaSettings>
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
-    <CamcorderProfiles cameraId="0" startOffsetMs="1500">
+    <CamcorderProfiles cameraId="0">
 
         <EncoderProfile quality="480p" fileFormat="mp4" duration="60">
             <Video codec="h264"

prebuilt/root/init.inc.rc

@@ -108,6 +108,8 @@ on boot
     mkdir /data/misc/dhcp 0770 dhcp dhcp
     chown dhcp dhcp /data/misc/dhcp
 
+    chmod 0644 /proc/cmdline
+
     chown bluetooth bluetooth /sys/class/rfkill/rfkill0/type
     chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state
     chmod 0660 /sys/class/rfkill/rfkill0/state

prebuilt/root/ueventd.inc.rc

@@ -6,6 +6,7 @@ mtd@misc                0460    radio   diag
 
 # gpu driver for adreno200 is globally accessible
 /dev/kgsl-3d0           0666    system  graphics
+/dev/ion                0664    system  system
 
 # wifi
 /dev/rfkill             0660    root        wifi

system.prop

@@ -2,6 +2,7 @@
 # system.prop for inc
 #
 
+ro.telephony.ril_class=HTCQualcommRIL
 rild.libpath=/system/lib/libhtc_ril.so
 ro.ril.def.preferred.network = 4
 ro.telephony.default_network = 4