Revert "Add product and system_ext partition for emulator"
This reverts commit ef7e3f2623
.
The configuration affects GSI to have separate partitions for product
and system_ext which was not intended.
Bug: 138742524
Bug: 138382074
Test: emulator; check boot
Change-Id: Ie621d6b49f22ee2775adf1c1497e812f840f8ba7
This commit is contained in:
parent
c5cb45b7da
commit
b5570cf17b
|
@ -649,6 +649,12 @@ $(call add-clean-step, find $(OUT_DIR) -type f -name "*link_type" -print0 | xarg
|
|||
# import_includes and export_includes files are no longer needed
|
||||
$(call add-clean-step, find $(OUT_DIR) -type f -name "import_includes" -o -name "export_includes" -print0 | xargs -0 rm -f)
|
||||
|
||||
# Recreate product and system_ext partitions for emulator
|
||||
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*product*)
|
||||
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*system_ext*)
|
||||
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*/product)
|
||||
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/generic*/*/system_ext)
|
||||
|
||||
# ************************************************
|
||||
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||
# ************************************************
|
||||
|
|
|
@ -37,9 +37,7 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
|
|||
BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions
|
||||
BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \
|
||||
system \
|
||||
vendor \
|
||||
product \
|
||||
system_ext
|
||||
vendor
|
||||
|
||||
# 3G
|
||||
BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 3221225472
|
||||
|
@ -57,11 +55,6 @@ else
|
|||
BOARD_VENDORIMAGE_PARTITION_SIZE := 146800640
|
||||
endif
|
||||
|
||||
TARGET_COPY_OUT_PRODUCT := product
|
||||
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
TARGET_COPY_OUT_SYSTEM_EXT := system_ext
|
||||
BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
|
||||
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
BOARD_FLASH_BLOCK_SIZE := 512
|
||||
DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml
|
||||
|
|
Loading…
Reference in New Issue