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

Commit bf13035f authored by Yo Chiang's avatar Yo Chiang Committed by android-build-merger
Browse files

Merge "Re-submit "Make mainline device use apex"" am: 491966fb am: db7529d0 

am: a3be8add

Change-Id: I32b28e515580aa1980af2a26328e9fcc33e1a8e7
parents e1212b27 a3be8add

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -680,6 +680,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

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

target/board/mainline_arm64/BoardConfig.mk

+5 −0
Original line number Diff line number Diff line
@@ -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