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

Merge "Clean up TARGET_FLATTEN_APEX lines in mainline products" am: 3ac9a12f5f am: 2eee2cd593

Browse Source 
Change-Id: I1a634deadbbad49cfabf4ead80c0f0581e34ce82
This commit is contained in:
Automerger Merge Worker
2020-01-07 09:17:41 +00:00
parent a93eac7c3f 2eee2cd593
commit ea31abaf4f
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