tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Add product and system_ext partition for emulator""

Browse source 
am: 0c55b6d2cb

Change-Id: I112c27402c00276f2442daeb233ceee73814fe0e
This commit is contained in:
Justin Yun 2019-08-07 16:58:49 -07:00 committed by android-build-merger
commit 66a0d43db2
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CleanSpec.mk
View file

@ -656,6 +656,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 # 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) $(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 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

9
target/board/BoardConfigEmuCommon.mk
View file

@ -37,9 +37,7 @@ 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
@ -57,11 +55,6 @@ 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