From a7062a977ab9e951a3bf7d18a9815bea41862d07 Mon Sep 17 00:00:00 2001 From: Wilson Sung Date: Thu, 8 Aug 2019 15:47:15 +0800 Subject: [PATCH] Disable dynamic partition Bug: 139107810 Change-Id: I0ba2c7fae77d61e0724d5b90af2f4a1f79fb1249 --- BoardConfig-common.mk | 28 ++++++++++------------------ device.mk | 2 -- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 55f270c..da2ef67 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -80,15 +80,20 @@ TARGET_RECOVERY_UI_LIB := \ libnos_for_recovery # Enable chain partition for system. -BOARD_AVB_VBMETA_SYSTEM := system -BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem -BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 -BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) -BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 +BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem +BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048 +BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) +BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 # product.img +BOARD_PRODUCTIMAGE_PARTITION_SIZE := 1073741824 BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 +# system.img +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 +BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0 +BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := 4096 + # userdata.img TARGET_USERIMAGES_USE_F2FS := true BOARD_USERDATAIMAGE_PARTITION_SIZE := 10737418240 @@ -224,19 +229,6 @@ BOARD_VENDOR_KERNEL_MODULES += \ $(wildcard device/google/redfin-kernel/*.ko) endif -BOARD_SUPER_PARTITION_SIZE := 9755951104 -BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions -BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \ - system \ - vendor \ - product - -#BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE is set to BOARD_SUPER_PARTITION_SIZE / 2 - 4MB -BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 4873781248 - -# Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB -BOARD_SUPER_PARTITION_ERROR_LIMIT := 9231663104 - # DTB ifeq (,$(filter-out redfin_kasan, $(TARGET_PRODUCT))) BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel/kasan diff --git a/device.mk b/device.mk index 07f2b39..93b9cca 100644 --- a/device.mk +++ b/device.mk @@ -723,8 +723,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ pixelstats-vendor -PRODUCT_USE_DYNAMIC_PARTITIONS := true - # fastbootd PRODUCT_PACKAGES += \ android.hardware.fastboot@1.0-impl.pixel \