Merge "Re-submit "Make mainline device use apex""

am: 491966fb7f

Change-Id: I32e950b118863ddfcfcb621cff664eb860345dc1
This commit is contained in:
Yo Chiang 2019-10-04 20:44:15 -07:00 committed by android-build-merger
commit db7529d009
2 changed files with 7 additions and 0 deletions

View file

@ -680,6 +680,8 @@ $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/host/*/fuzz/*)
# Change file layout of system_other # Change file layout of system_other
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

View file

@ -34,3 +34,8 @@ AB_OTA_PARTITIONS := system
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
# Mainline devices support apex
# TODO: move this to BoardConfigMainlineCommon. Currently, GSI wants flattened
# apexes, but emulator wants .apex files, preventing this.
TARGET_FLATTEN_APEX := false