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

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

Add product and system_ext partition for emulator 

Build product and system_ext image and add them to super partition.

Bug: 138382074
Test: boot emulator and check system_ext partition mounted
Change-Id: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
Merged-In: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
parent c864fe90

CleanSpec.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -638,6 +638,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libc_malloc*) 
# Move odm build.prop to /odm/etc/.

# Move odm build.prop to /odm/etc/.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/odm/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/odm/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/odm/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/odm/build.prop)



# Move product and system_ext to root for emulators

$(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

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

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

target/board/BoardConfigEmuCommon.mk

+8 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,9 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) 
  BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions

  BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions

  BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \

  BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \

      system \

      system \

      vendor

      vendor \

      product \

      system_ext





  # 3G

  # 3G

  BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 3221225472

  BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 3221225472
@@ -55,6 +57,11 @@ else 
  BOARD_VENDORIMAGE_PARTITION_SIZE := 146800640

  BOARD_VENDORIMAGE_PARTITION_SIZE := 146800640

endif

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_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_FLASH_BLOCK_SIZE := 512

BOARD_FLASH_BLOCK_SIZE := 512

DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml

DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml