Remove product partition.

Bug: 116126656 Test: Build Pass, boot to home Change-Id: Ice58f446fcc5bb0e57287b085a5a8faef22b74f8 Signed-off-by: Randall Huang <huangrandall@google.com>
LineageOS · Sep 25, 2018 · 1d41576 · 1d41576
1 parent 5c511ed
commit 1d41576
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
@@ -91,11 +91,6 @@ BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
 
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 
-# product.img
-BOARD_PRODUCTIMAGE_PARTITION_SIZE := 314572800
-BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
-TARGET_COPY_OUT_PRODUCT := product
-
 # system.img
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2952790016
 BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0

diff --git a/CleanSpec.mk b/CleanSpec.mk
@@ -122,3 +122,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/include)
 # Secure_element HAL for eSE1
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.secure_element@1.0-service.rc)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.secure_element@1.0-service)
+
+# Remove /product mount point
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/product)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product)
+
diff --git a/device.mk b/device.mk
@@ -150,8 +150,7 @@ AB_OTA_PARTITIONS += \
     boot \
     system \
     vbmeta \
-    dtbo \
-    product
+    dtbo
 
 AB_OTA_POSTINSTALL_CONFIG += \
     RUN_POSTINSTALL_system=true \

diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
@@ -230,7 +230,7 @@ static void DumpTouch(int fd) {
 
 static void DumpF2FS(int fd) {
     DumpFileToFd(fd, "F2FS", "/sys/kernel/debug/f2fs/status");
-    DumpFileToFd(fd, "F2FS - fragmentation", "/proc/fs/f2fs/dm-3/segment_info");
+    DumpFileToFd(fd, "F2FS - fragmentation", "/proc/fs/f2fs/dm-2/segment_info");
 }
 
 static void DumpeMMC(int fd) {

diff --git a/gpt-utils/gpt-utils.h b/gpt-utils/gpt-utils.h
@@ -84,7 +84,7 @@ extern "C" {
             "dtbo", "hyp", "keymaster", "qupfw", "storsec", \
             "tz", "vbmeta", "xbl_config"
 
-#define AB_PTN_LIST PTN_SWAP_LIST, "boot", "system", "vendor", "modem", "product"
+#define AB_PTN_LIST PTN_SWAP_LIST, "boot", "system", "vendor", "modem"
 #define BOOT_DEV_DIR    "/dev/block/bootdevice/by-name"
 
 /******************************************************************************

diff --git a/init.hardware.rc b/init.hardware.rc
@@ -83,7 +83,6 @@ on init && property:vendor.skip.init=0
     write /sys/block/mmcblk0/queue/nr_requests 256
     write /sys/block/dm-0/queue/read_ahead_kb 2048
     write /sys/block/dm-1/queue/read_ahead_kb 2048
-    write /sys/block/dm-2/queue/read_ahead_kb 2048
 
     # Disable powersaving
     write /sys/module/lpm_levels/parameters/sleep_disabled 1
@@ -254,7 +253,7 @@ on late-fs
     # Mount RW partitions which need run fsck
     mount_all /vendor/etc/fstab.${ro.boot.hardware.platform} --late
     # Boot time fs tune
-    write /sys/block/dm-3/queue/read_ahead_kb 2048
+    write /sys/block/dm-2/queue/read_ahead_kb 2048
 
     # Required for time_daemon
     mkdir /persist/time 0770 system system
@@ -561,7 +560,6 @@ on property:sys.boot_completed=1
     write /sys/block/dm-0/queue/read_ahead_kb 128
     write /sys/block/dm-1/queue/read_ahead_kb 128
     write /sys/block/dm-2/queue/read_ahead_kb 128
-    write /sys/block/dm-3/queue/read_ahead_kb 128
 
     # QCOM FG SRAM dump for dumpstate
     chown system system /d/fg/sram/data

diff --git a/recovery.wipe b/recovery.wipe
@@ -1,8 +1,6 @@
 # All the partitions to be wiped (in order) under recovery.
 /dev/block/bootdevice/by-name/system_a
 /dev/block/bootdevice/by-name/system_b
-/dev/block/bootdevice/by-name/product_a
-/dev/block/bootdevice/by-name/product_b
 /dev/block/bootdevice/by-name/vendor_a
 /dev/block/bootdevice/by-name/vendor_b
 /dev/block/bootdevice/by-name/userdata