updates to cleanup tree

BoardConfig.mk

@@ -67,7 +67,7 @@ BOARD_RAMDISK_OFFSET       := 0x01000000
 BOARD_DTB_OFFSET           := 0x01f00000
 TARGET_KERNEL_ARCH := arm64
 TARGET_PREBUILT_DTB := $(LOCAL_PATH)/prebuilt/dtb.img
-TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/prebuilt/Image
+TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/prebuilt/Image.gz
 BOARD_PREBUILT_DTBOIMAGE := $(LOCAL_PATH)/prebuilt/dtbo.img
 BOARD_INCLUDE_RECOVERY_DTBO := true
 BOARD_INCLUDE_DTB_IN_BOOTIMG := true
@@ -89,31 +89,31 @@ QCOM_BOARD_PLATFORMS += $(TARGET_BOARD_PLATFORM)
 
 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 262144
+BOARD_USES_PRODUCTIMAGE := true
 
 BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 104857600
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3311906816
+#BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3758096384
 BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0
 BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := 4096
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 495457218560
-BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
-BOARD_VENDORIMAGE_PARTITION_SIZE := 1221173248
+#BOARD_USERDATAIMAGE_PARTITION_SIZE := 495457218560
+#BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
+#BOARD_VENDORIMAGE_PARTITION_SIZE := 1221173248
 TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
-BOARD_PRODUCTIMAGE_PARTITION_SIZE := 1038712832
+#BOARD_PRODUCTIMAGE_PARTITION_SIZE := 1038712832
 #BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_ODMIMAGE_PARTITION_SIZE := 974848
+#BOARD_ODMIMAGE_PARTITION_SIZE := 974848
 #BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
+#BOARD_DTBOIMG_PARTITION_SIZE := 25165824
 
 #super
-BOARD_SUPER_PARTITION_SIZE := 12884901888
+BOARD_SUPER_PARTITION_SIZE := 15032385536
 BOARD_SUPER_PARTITION_GROUPS := qti_dynamic_partitions
-BOARD_QTI_DYNAMIC_PARTITIONS_SIZE := 5572767744
+BOARD_QTI_DYNAMIC_PARTITIONS_SIZE := 7511998464
 BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := \
     system \
-    product \
-    vendor \
-    odm
+    product
 
 TARGET_NO_KERNEL := false
 TARGET_NO_RECOVERY := false
@@ -125,6 +125,8 @@ TARGET_RECOVERY_FSTAB := $(LOCAL_PATH)/recovery.fstab
 
 # Workaround for error copying vendor files to recovery ramdisk
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+#TARGET_COPY_OUT_ODM := odm
+TARGET_COPY_OUT_PRODUCT := product
 TARGET_COPY_OUT_VENDOR := vendor
 
 # Recovery
@@ -148,6 +150,7 @@ TW_THEME := portrait_hdpi
 TARGET_USE_CUSTOM_LUN_FILE_PATH := /config/usb_gadget/g1/functions/mass_storage.0/lun.%d/file
 TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888
 TW_NO_EXFAT_FUSE := true
+TW_NO_BIND_SYSTEM := true
 #TW_NO_SCREEN_BLANK := true
 #TW_USE_TOOLBOX := true
 

recovery.fstab

@@ -38,7 +38,7 @@
 system                                                  /system                ext4    ro,barrier=1,discard                                 wait,slotselect
 product                                                 /product               ext4    ro,barrier=1,discard                                 wait,slotselect
 vendor                                                  /vendor                ext4    ro,barrier=1,discard                                 wait,slotselect
-odm                                                     /odm                   ext4    ro,barrier=1,discard                                 wait,slotselect
+#odm                                                     /odm                   ext4    ro,barrier=1,discard                                 wait,slotselect
 /dev/block/by-name/metadata                             /metadata              ext4    noatime,nosuid,nodev,discard                         wait,formattable,wrappedkey
 /dev/block/bootdevice/by-name/userdata                  /data                  f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier    wait,check,formattable,fileencryption=ice,wrappedkey,keydirectory=/metadata/vold/metadata_encryption
 /dev/block/bootdevice/by-name/persist                   /persist               ext4    noatime,nosuid,nodev,barrier=1                       wait

recovery/root/system/etc/twrp.flags

@@ -3,7 +3,7 @@
 system		/system			ext4		slotselect;logical
 vendor		/vendor			ext4		slotselect;display="Vendor";logical
 product		/product		ext4			slotselect;display="Product";logical
-odm			/odm		    ext4				slotselect;display="Odm";logical
+#odm			/odm		    ext4				slotselect;display="Odm";logical
 /metadata	ext4	/dev/block/bootdevice/by-name/metadata 					
 /data		f2fs	/dev/block/bootdevice/by-name/userdata					flags=fileencryption=ice:aes-256-cts;wrappedkey;keydirectory=/metadata/vold/metadata_encryption
 /recovery   emmc    /dev/block/bootdevice/by-name/recovery                    flags=slotselect;display="Recovery";backup=1;flashimg=1