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

Commit ea31abaf authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products" am: 3ac9a12f am: 2eee2cd5 

Change-Id: I1a634deadbbad49cfabf4ead80c0f0581e34ce82
parents a93eac7c 2eee2cd5

target/board/mainline_arm64/BoardConfig.mk

+0 −5
Original line number Diff line number Diff line
@@ -40,8 +40,3 @@ AB_OTA_PARTITIONS := system 
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_VENDORIMAGE_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

target/board/mainline_x86/BoardConfig.mk

+0 −4
Original line number Diff line number Diff line
@@ -29,7 +29,3 @@ AB_OTA_PARTITIONS := system 
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 


# Mainline devices support apex

# TODO: move this to product makefile and use updatable_apex.mk

TARGET_FLATTEN_APEX := false

target/board/mainline_x86_arm/BoardConfig.mk

+0 −4
Original line number Diff line number Diff line
@@ -34,7 +34,3 @@ AB_OTA_PARTITIONS := system 
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 


# Mainline devices support apex

# TODO: move this to product makefile and use updatable_apex.mk

TARGET_FLATTEN_APEX := false

target/product/mainline_system_x86_64.mk

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ $(call enforce-product-packages-exist,) 
# Enable mainline checking

PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true



# Enable nonflat APEX

$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)



PRODUCT_BUILD_CACHE_IMAGE := false

PRODUCT_BUILD_ODM_IMAGE := false

PRODUCT_BUILD_PRODUCT_IMAGE  := false