Remove product_services partition
Product_services partition will be renamed to system_ext. Until we
have system_ext partition, temporarily remove product_services
partition from device configurations.
Product_services partition is being used only for mainline_blueline
device test now.
Bug: 136154856
Bug: 134359158
Test: Build mainline_blueline
Change-Id: I79f0b0347068da8ab739a7721593cb142cb14a9a
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index c886edd..342bbdf 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -79,8 +79,9 @@
endif
ifneq ($(filter %_mainline,$(TARGET_PRODUCT)),)
+# TODO (b/136154856) product_services partition is removed from
+# AB_OTA_PARTITIONS. Instead, we will add system_ext once it is ready.
AB_OTA_PARTITIONS += \
- product_services \
vbmeta_system
endif
@@ -100,7 +101,9 @@
libfstab
ifneq ($(filter %_mainline,$(TARGET_PRODUCT)),)
-BOARD_AVB_VBMETA_SYSTEM := system product_services
+# TODO (b/136154856) product_services partition is removed from
+# BOARD_AVB_VBMETA_SYSTEM. Instead, we will add system_ext once it is ready.
+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)
@@ -162,15 +165,21 @@
BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 4069523456
else
# Mainline Pixel 3 has an actual super partition.
-BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE := ext4
-TARGET_COPY_OUT_PRODUCT_SERVICES := product_services
+
+# TODO (b/136154856) product_services partition is removed.
+# Instead, we will add system_ext once it is ready.
+# BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE := ext4
+# TARGET_COPY_OUT_PRODUCT_SERVICES := product_services
BOARD_SUPER_PARTITION_SIZE := 12884901888
# Assume 1MB metadata size.
# TODO(b/117997386): Use correct metadata size.
BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 6441402368
-BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST += \
- product_services \
+
+# TODO (b/136154856) product_services partition removed.
+# Instead, we will add system_ext once it is ready.
+# BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST += \
+# product_services \
endif # PRODUCT_RETROFIT_DYNAMIC_PARTITIONS
endif # PRODUCT_USE_DYNAMIC_PARTITIONS
diff --git a/fstab.mainline.hardware b/fstab.mainline.hardware
index 58974d7..28548aa 100644
--- a/fstab.mainline.hardware
+++ b/fstab.mainline.hardware
@@ -4,7 +4,8 @@
system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount
product /product ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount
-product_services /product_services ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount
+# TODO(b/136154856) product_services will be renamed to system_ext
+#product_services /product_services ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount
/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable,first_stage_mount
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,fileencryption=ice,keydirectory=/metadata/vold/metadata_encryption,quota,formattable,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,reservedsize=128M
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
diff --git a/gpt-utils/gpt-utils.h b/gpt-utils/gpt-utils.h
index cc8d3a3..c3321df 100644
--- a/gpt-utils/gpt-utils.h
+++ b/gpt-utils/gpt-utils.h
@@ -84,8 +84,7 @@
"devcfg", "dtbo", "hyp", "keymaster", "msadp", \
"qupfw", "storsec", "tz", "vbmeta", "vbmeta_system", "xbl_config"
-#define AB_PTN_LIST PTN_SWAP_LIST, "boot", "system", "vendor", "modem", "product", \
- "product_services"
+#define AB_PTN_LIST PTN_SWAP_LIST, "boot", "system", "vendor", "modem", "system_ext", "product"
#define BOOT_DEV_DIR "/dev/block/bootdevice/by-name"
/******************************************************************************
