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

Commit b8205595 authored by Anton Hansson's avatar Anton Hansson Committed by Yo Chiang
Browse files

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
parent f89f29d6

CleanSpec.mk

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

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

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