高通data分区修改
diff --git a/build/make/core/Makefile b/build/make/core/Makefileold mode 100644new mode 100755index 5e98a8b…5e44695— a/build/make/core/Makefile+++ b/build/make/core/Makefile@@ -1361,6 +1361,10 @...
·
diff --git a/build/make/core/Makefile b/build/make/core/Makefile
old mode 100644
new mode 100755
index 5e98a8b…5e44695
— a/build/make/core/Makefile
+++ b/build/make/core/Makefile
@@ -1361,6 +1361,10 @@ $(if $(filter KaTeX parse error: Undefined control sequence: \ at position 13: (2),system),\̲ ̲ (if $(filter $(2),userdata),
$(if
(
B
O
A
R
D
U
S
E
R
D
A
T
A
I
M
A
G
E
F
I
L
E
S
Y
S
T
E
M
T
Y
P
E
)
,
(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE),
(BOARDUSERDATAIMAGEFILESYSTEMTYPE),(hide) echo “userdata_fs_type=$(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE)” >> $(1))
$(if
(
B
O
A
R
D
U
S
E
R
D
A
T
A
I
M
A
G
E
P
A
R
T
I
T
I
O
N
S
I
Z
E
)
,
(BOARD_USERDATAIMAGE_PARTITION_SIZE),
(BOARDUSERDATAIMAGEPARTITIONSIZE),(hide) echo “userdata_size=$(BOARD_USERDATAIMAGE_PARTITION_SIZE)” >> $(1))
+ #meig:jicong.wang modify for task 4662 start {@
+ $(if
(
B
O
A
R
D
U
S
E
R
D
A
T
A
I
M
A
G
E
3
2
G
P
A
R
T
I
T
I
O
N
S
I
Z
E
)
,
(BOARD_USERDATAIMAGE_32G_PARTITION_SIZE),
(BOARDUSERDATAIMAGE32GPARTITIONSIZE),(hide) echo “userdata_32G_size=$(BOARD_USERDATAIMAGE_32G_PARTITION_SIZE)” >> $(1))
+ $(if
(
B
O
A
R
D
U
S
E
R
D
A
T
A
I
M
A
G
E
1
28
G
P
A
R
T
I
T
I
O
N
S
I
Z
E
)
,
(BOARD_USERDATAIMAGE_128G_PARTITION_SIZE),
(BOARDUSERDATAIMAGE128GPARTITIONSIZE),(hide) echo “userdata_128G_size=$(BOARD_USERDATAIMAGE_128G_PARTITION_SIZE)” >> KaTeX parse error: Expected 'EOF', got '#' at position 11: (1)) + #̲meig:jicong.wan…(if $(filter $(2),cache),
$(if
(
B
O
A
R
D
C
A
C
H
E
I
M
A
G
E
F
I
L
E
S
Y
S
T
E
M
T
Y
P
E
)
,
(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE),
(BOARDCACHEIMAGEFILESYSTEMTYPE),(hide) echo “cache_fs_type=$(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE)” >> $(1))
@@ -2486,10 +2490,28 @@ boottarball-nodeps btnod: $(FS_GET_STATS)
INTERNAL_USERDATAIMAGE_FILES :=
$(filter
(
T
A
R
G
E
T
O
U
T
D
A
T
A
)
/
(TARGET_OUT_DATA)/%,
(TARGETOUTDATA)/(ALL_DEFAULT_INSTALLED_MODULES))
+#meig:jicong.wang modify for task 4662 start {@
+ifdef INTERNAL_USERIMAGES_EXT_VARIANT
+ifndef BOARD_USERDATAIMAGE_32G_PARTITION_SIZE
+BOARD_USERDATAIMAGE_32G_PARTITION_SIZE := 21193800704
+endif
+endif
+
+ifdef INTERNAL_USERIMAGES_EXT_VARIANT
+ifndef BOARD_USERDATAIMAGE_128G_PARTITION_SIZE
+BOARD_USERDATAIMAGE_128G_PARTITION_SIZE := 48318382080
+endif
+endif
+#meig:jicong.wang modify for task 4662 end @}
+
ifdef BUILDING_USERDATA_IMAGE
userdataimage_intermediates :=
$(call intermediates-dir-for,PACKAGING,userdata)
BUILT_USERDATAIMAGE_TARGET := $(PRODUCT_OUT)/userdata.img
+#meig:jicong.wang modify for task 4662 start {@
+BUILT_USERDATAIMAGE_32G_TARGET := $(PRODUCT_OUT)/userdata_32G.img
+BUILT_USERDATAIMAGE_128G_TARGET := $(PRODUCT_OUT)/userdata_128G.img
+#meig:jicong.wang modify for task 4662 end @}
define build-userdataimage-target
$(call pretty,“Target userdata fs image: $(INSTALLED_USERDATAIMAGE_TARGET)”)
@@ -2500,10 +2522,25 @@ define build-userdataimage-target
build/make/tools/releasetools/build_image.py
$(TARGET_OUT_DATA) $(userdataimage_intermediates)/userdata_image_info.txt $(INSTALLED_USERDATAIMAGE_TARGET) $(TARGET_OUT)
$(hide)
(
c
a
l
l
a
s
s
e
r
t
−
m
a
x
−
i
m
a
g
e
−
s
i
z
e
,
(call assert-max-image-size,
(callassert−max−image−size,(INSTALLED_USERDATAIMAGE_TARGET),$(BOARD_USERDATAIMAGE_PARTITION_SIZE))
+#meig:jicong.wang modify for task 4662 start {@
+
(
h
i
d
e
)
P
A
T
H
=
(hide) PATH=
(hide)PATH=(foreach p,
(
I
N
T
E
R
N
A
L
U
S
E
R
I
M
A
G
E
S
B
I
N
A
R
Y
P
A
T
H
S
)
,
(INTERNAL_USERIMAGES_BINARY_PATHS),
(INTERNALUSERIMAGESBINARYPATHS),§😃KaTeX parse error: Undefined control sequence: \ at position 6: PATH \̲ ̲+ build/ma…PATH
+ build/make/tools/releasetools/build_image.py
+ $(TARGET_OUT_DATA) $(userdataimage_intermediates)/userdata_image_info.txt $(INSTALLED_USERDATAIMAGE_32G_TARGET) $(TARGET_OUT)
+ $(hide)
(
c
a
l
l
a
s
s
e
r
t
−
m
a
x
−
i
m
a
g
e
−
s
i
z
e
,
(call assert-max-image-size,
(callassert−max−image−size,(INSTALLED_USERDATAIMAGE_32G_TARGET),$(BOARD_USERDATAIMAGE_32G_PARTITION_SIZE))
+#meig:jicong.wang modify for task 4662 end @}
endef
# We just build this directly to the install location.
INSTALLED_USERDATAIMAGE_TARGET := $(BUILT_USERDATAIMAGE_TARGET)
+#meig:jicong.wang modify for task 4662 start {@
+INSTALLED_USERDATAIMAGE_32G_TARGET := $(BUILT_USERDATAIMAGE_32G_TARGET)
+INSTALLED_USERDATAIMAGE_128G_TARGET := $(BUILT_USERDATAIMAGE_128G_TARGET)
+#meig:jicong.wang modify for task 4662 end @}
INSTALLED_USERDATAIMAGE_TARGET_DEPS :=
$(INTERNAL_USERIMAGES_DEPS)
$(INTERNAL_USERDATAIMAGE_FILES)
diff --git a/build/make/tools/releasetools/build_image.py b/build/make/tools/releasetools/build_image.py
index 4136ed4…3421f97 100755
— a/build/make/tools/releasetools/build_image.py
+++ b/build/make/tools/releasetools/build_image.py
@@ -594,6 +594,26 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
copy_prop(“userdata_size”, “partition_size”)
copy_prop(“flash_logical_block_size”, “flash_logical_block_size”)
copy_prop(“flash_erase_block_size”, “flash_erase_block_size”)
+ #meig:jicong.wang modify for task 4662 start {@
+ elif mount_point == “data_32G”:#chenyong modify task898 flash userdata begin
+ # Copy the generic fs type first, override with specific one if available.
+ d[“mount_point”] = “data”
+ mount_point = “data”
+ copy_prop(“fs_type”, “fs_type”)
+ copy_prop(“userdata_fs_type”, “fs_type”)
+ copy_prop(“userdata_32G_size”, “partition_size”)
+ copy_prop(“flash_logical_block_size”, “flash_logical_block_size”)
+ copy_prop(“flash_erase_block_size”, “flash_erase_block_size”)
+ elif mount_point == “data_128G”:
+ # Copy the generic fs type first, override with specific one if available.
+ d[“mount_point”] = “data”
+ mount_point = “data”
+ copy_prop(“fs_type”, “fs_type”)
+ copy_prop(“userdata_fs_type”, “fs_type”)
+ copy_prop(“userdata_128G_size”, “partition_size”)
+ copy_prop(“flash_logical_block_size”, “flash_logical_block_size”)
+ copy_prop(“flash_erase_block_size”, “flash_erase_block_size”)
+ #meig:jicong.wang modify for task 4662 end @}
elif mount_point == “cache”:
copy_prop(“cache_fs_type”, “fs_type”)
copy_prop(“cache_size”, “partition_size”)
@@ -759,6 +779,12 @@ def main(argv):
mount_point = “system_other”
elif image_filename == “userdata.img”:
mount_point = “data”
+ #meig:jicong.wang modify for task 4662 start {@
+ elif image_filename == “userdata_32G.img”:
+ mount_point = “data_32G”
+ elif image_filename == “userdata_128G.img”:
+ mount_point = “data_128G”
+ #meig:jicong.wang modify for task 4662 end @}
elif image_filename == “cache.img”:
mount_point = “cache”
elif image_filename == “vendor.img”:
diff --git a/device/qcom/sdm660_64/BoardConfig.mk b/device/qcom/sdm660_64/BoardConfig.mk
old mode 100644
new mode 100755
index 15aca29…a39daa5
— a/device/qcom/sdm660_64/BoardConfig.mk
+++ b/device/qcom/sdm660_64/BoardConfig.mk
@@ -153,8 +153,11 @@ else
TARGET_RECOVERY_FSTAB := device/qcom/sdm660_64/recovery_non-AB_dynamic_variant.fstab
endif
endif
+#meig:jicong.wang modify for task 4662 start {@
BOARD_USERDATAIMAGE_PARTITION_SIZE := 48318382080
+BOARD_USERDATAIMAGE_32G_PARTITION_SIZE := 21193800704
+BOARD_USERDATAIMAGE_128G_PARTITION_SIZE := 48318382080
+#mei:jicong.wang modify for task 4662 end @}
BOARD_PERSISTIMAGE_PARTITION_SIZE := 33554432
BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64)
开放原子开发者工作坊旨在鼓励更多人参与开源活动，与志同道合的开发者们相互交流开发经验、分享开发心得、获取前沿技术趋势。工作坊有多种形式的开发者活动，如meetup、训练营等，主打技术交流，干货满满，真诚地邀请各位开发者共同参与！
更多推荐
0
0- 0
已为社区贡献3条内容
所有评论(0)