StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 0a81687a25 to qt-r1-dev-plus-aosp

Browse Source 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iee31e0df5e5d2b94c9ba7d6815fbbb41497c33c6
This commit is contained in:
Justin Yun
2019-07-31 13:33:59 +09:00
parent 76fc1ce5ff 0a81687a25
commit eac89fa9cb
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CleanSpec.mk
View File

@@ -650,6 +650,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/odm/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcameraservice.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcameraservice.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcamera_client.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcamera_client.so)
# 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
# ************************************************ # ************************************************

9
target/board/BoardConfigEmuCommon.mk
View File

@@ -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