Re-submit "Make mainline device use apex"

The build system default was changed to not support apex, but
we want the mainline device to enable it.

Test: make mainline_system
Merged-In: I9f29e8354acffb1856dfd8a173b80a3f9324630c
Change-Id: I9f29e8354acffb1856dfd8a173b80a3f9324630c
This commit is contained in:
Anton Hansson 2019-06-07 13:36:17 +01:00 committed by Yo Chiang
parent f89f29d669
commit b8205595c0
2 changed files with 7 additions and 0 deletions

View file

@ -676,6 +676,8 @@ $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/host/*/fuzz/*)
# 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/apex)
# ************************************************
# 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_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