StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up TARGET_FLATTEN_APEX lines in mainline products

Browse Source 
Remove redundant TARGET_FLATTEN_APEX lines from mainline board configs.
Remove redundant "inherit updatable_apex.mk" lines from
mainline_system_$arch makefiles.
mainline_system.mk now always install APEX into /system partition.
Products who need flattened APEXes would have their flattened APEXes
installed into /system_ext.

Test: Build mainline_system_arm64 and validate noop
Change-Id: I9ee4af529a4bd554cb8707cfc260d6b912fd5fff
This commit is contained in:
Yo Chiang
2019-12-30 16:12:13 +08:00
parent 4506b17dd3
commit 4a5ff18a01
4 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
target/board/mainline_arm64/BoardConfig.mk
View File

@@ -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

4
target/board/mainline_x86/BoardConfig.mk
View File

@@ -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

4
target/board/mainline_x86_arm/BoardConfig.mk
View File

@@ -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

3
target/product/mainline_system_x86_64.mk
View File

@@ -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