Update for cm-13.0 with fstab v2 support

This relies on fstab v2 support, currently only available via
unofficial TWRP fork: github.com/mdmower/twrp

Change-Id: Iebbb441c1cfb40928191f81d3c48497d1558fc3b

BoardConfig.mk

@@ -38,7 +38,7 @@ TARGET_USE_QCOM_BIONIC_OPTIMIZATION := true
 
 # Kernel
 BOARD_KERNEL_BASE := 0x80400000
-BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.hardware=qcom androidboot.selinux=permissive
+BOARD_KERNEL_CMDLINE := console=none androidboot.hardware=qcom androidboot.selinux=permissive
 BOARD_KERNEL_PAGESIZE := 2048
 BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x01700000
 TARGET_KERNEL_CONFIG := ville_defconfig
@@ -47,9 +47,6 @@ TARGET_KERNEL_SOURCE := kernel/htc/msm8960
 # QCOM hardware
 BOARD_USES_QCOM_HARDWARE := true
 
-# Flags
-COMMON_GLOBAL_CFLAGS += -DHTCLOG
-
 # Graphics
 USE_OPENGL_RENDERER := true
 TARGET_DISPLAY_USE_RETIRE_FENCE := true
@@ -63,6 +60,7 @@ TARGET_POWERHAL_VARIANT := qcom
 
 # Filesystem
 TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USERIMAGES_USE_F2FS := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 16777216
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 16776704
 # Pre-HBOOT 2.16
@@ -87,13 +85,8 @@ BOARD_CHARGING_MODE_BOOTING_LPM := /sys/htc_lpm/lpm_mode
 
 # SELinux
 -include device/qcom/sepolicy/sepolicy.mk
-
 BOARD_SEPOLICY_DIRS += device/htc/ville/sepolicy
 
-BOARD_SEPOLICY_UNION += \
-    akmd.te \
-    ewtzmud.te
-
 # TWRP
 TW_THEME := portrait_mdpi
 TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
@@ -105,6 +98,6 @@ BOARD_RECOVERY_BLDRMSG_OFFSET := 2048
 RECOVERY_VARIANT := twrp
 TARGET_RECOVERY_DEVICE_MODULES := chargeled
 BOARD_HAS_NO_REAL_SDCARD := true
-TW_INCLUDE_DUMLOCK := true
 TW_EXTERNAL_STORAGE_PATH := "/usb-otg"
 TW_EXTERNAL_STORAGE_MOUNT_POINT := "usb-otg"
+TW_INCLUDE_NTFS_3G := true

recovery.fstab

@@ -1,11 +1,11 @@
-# mount point   fstype      device  [device2]                                [parameters]
-/boot           emmc        /dev/block/platform/msm_sdcc.1/by-name/boot
-/cache          ext4        /dev/block/platform/msm_sdcc.1/by-name/cache
-/data           ext4        /dev/block/platform/msm_sdcc.1/by-name/userdata  flags=encryptable=/dev/block/platform/msm_sdcc.1/by-name/extra
-/devlog         ext4        /dev/block/platform/msm_sdcc.1/by-name/devlog
-/misc           emmc        /dev/block/platform/msm_sdcc.1/by-name/misc
-/recovery       emmc        /dev/block/platform/msm_sdcc.1/by-name/recovery
-/system         ext4        /dev/block/platform/msm_sdcc.1/by-name/system
-# storage volumes
-/sdcard         vfat        /dev/block/mmcblk0p36                            flags=display="Internal Storage";settingsstorage
-/usb-otg        vfat        /dev/block/sda1  /dev/block/sda                  flags=display="USB OTG";storage;wipeingui;removable
+# device                                           mount_point     fstype  mount_flags                             fs_flags    twrp_flags
+/dev/block/platform/msm_sdcc.1/by-name/boot        /boot           emmc    defaults                                defaults
+/dev/block/platform/msm_sdcc.1/by-name/cache       /cache          ext4    noatime,nosuid,nodev                    defaults
+/dev/block/platform/msm_sdcc.1/by-name/userdata    /data           ext4    noatime,nosuid,nodev,noauto_da_alloc    defaults    twrp=encryptable=/dev/block/platform/msm_sdcc.1/by-name/extra
+/dev/block/platform/msm_sdcc.1/by-name/devlog      /devlog         ext4    noatime,nosuid,nodev                    defaults    twrp=display="Devlog"
+/dev/block/platform/msm_sdcc.1/by-name/misc        /misc           emmc    defaults                                defaults
+/dev/block/platform/msm_sdcc.1/by-name/recovery    /recovery       emmc    defaults                                defaults
+/dev/block/platform/msm_sdcc.1/by-name/system      /system         ext4    noatime                                 defaults
+
+/dev/block/platform/msm_sdcc.1/by-name/fat         /sdcard         vfat    defaults                                defaults    twrp=display="Internal Storage";settingsstorage
+/dev/block/sda1                                    /usb-otg        vfat    defaults                                defaults    twrp=display="USB OTG";storage;wipeingui;removable

recovery/chargeled/Android.mk

@@ -28,4 +28,5 @@ LOCAL_MODULE := chargeled
 LOCAL_MODULE_TAGS := optional eng
 LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
 LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_PACK_MODULE_RELOCATIONS := false
 include $(BUILD_EXECUTABLE)

recovery/root/etc/recovery.fstab.dm

@@ -1,10 +1,10 @@
-# mount point   fstype      device  [device2]                                [parameters]
-/boot           emmc        /dev/block/platform/msm_sdcc.1/by-name/boot
-/cache          ext4        /dev/block/platform/msm_sdcc.1/by-name/cache
-/data           ext4        /dev/block/platform/msm_sdcc.1/by-name/userdata  flags=encryptable=/dev/block/platform/msm_sdcc.1/by-name/extra
-/devlog         ext4        /dev/block/platform/msm_sdcc.1/by-name/devlog
-/misc           emmc        /dev/block/platform/msm_sdcc.1/by-name/misc
-/recovery       emmc        /dev/block/platform/msm_sdcc.1/by-name/recovery
-/system         ext4        /dev/block/platform/msm_sdcc.1/by-name/system
-# storage volumes
-/usb-otg        vfat        /dev/block/sda1  /dev/block/sda                  flags=display="USB OTG";storage;wipeingui;removable
+# device                                           mount_point     fstype  mount_flags                             fs_flags    twrp_flags
+/dev/block/platform/msm_sdcc.1/by-name/boot        /boot           emmc    defaults                                defaults
+/dev/block/platform/msm_sdcc.1/by-name/cache       /cache          ext4    noatime,nosuid,nodev                    defaults
+/dev/block/platform/msm_sdcc.1/by-name/userdata    /data           ext4    noatime,nosuid,nodev,noauto_da_alloc    defaults    twrp=encryptable=/dev/block/platform/msm_sdcc.1/by-name/extra
+/dev/block/platform/msm_sdcc.1/by-name/devlog      /devlog         ext4    noatime,nosuid,nodev                    defaults    twrp=display="Devlog"
+/dev/block/platform/msm_sdcc.1/by-name/misc        /misc           emmc    defaults                                defaults
+/dev/block/platform/msm_sdcc.1/by-name/recovery    /recovery       emmc    defaults                                defaults
+/dev/block/platform/msm_sdcc.1/by-name/system      /system         ext4    noatime                                 defaults
+
+/dev/block/sda1                                    /usb-otg        vfat    defaults                                defaults    twrp=display="USB OTG";storage;wipeingui;removable