Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5570cf1 authored by Justin Yun's avatar Justin Yun
Browse files

Revert "Add product and system_ext partition for emulator" 

This reverts commit ef7e3f26.

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
parent c5cb45b7

CleanSpec.mk

+6 −0
Original line number Diff line number Diff line
@@ -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

# ************************************************

target/board/BoardConfigEmuCommon.mk

+1 −8
Original line number Diff line number Diff line
@@ -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