From 4a5ff18a0108f9ba474a0860364ead4cab980877 Mon Sep 17 00:00:00 2001 From: Yo Chiang Date: Mon, 30 Dec 2019 16:12:13 +0800 Subject: [PATCH] Clean up TARGET_FLATTEN_APEX lines in mainline products 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 --- target/board/mainline_arm64/BoardConfig.mk | 5 ----- target/board/mainline_x86/BoardConfig.mk | 4 ---- target/board/mainline_x86_arm/BoardConfig.mk | 4 ---- target/product/mainline_system_x86_64.mk | 3 --- 4 files changed, 16 deletions(-) diff --git a/target/board/mainline_arm64/BoardConfig.mk b/target/board/mainline_arm64/BoardConfig.mk index c53da9ec6c..a09960f531 100644 --- a/target/board/mainline_arm64/BoardConfig.mk +++ b/target/board/mainline_arm64/BoardConfig.mk @@ -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 diff --git a/target/board/mainline_x86/BoardConfig.mk b/target/board/mainline_x86/BoardConfig.mk index a20d17cf01..4dda058b3c 100644 --- a/target/board/mainline_x86/BoardConfig.mk +++ b/target/board/mainline_x86/BoardConfig.mk @@ -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 diff --git a/target/board/mainline_x86_arm/BoardConfig.mk b/target/board/mainline_x86_arm/BoardConfig.mk index 6b282c29eb..d775a77d81 100644 --- a/target/board/mainline_x86_arm/BoardConfig.mk +++ b/target/board/mainline_x86_arm/BoardConfig.mk @@ -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 diff --git a/target/product/mainline_system_x86_64.mk b/target/product/mainline_system_x86_64.mk index 1b1a42fe5b..473ff7236f 100644 --- a/target/product/mainline_system_x86_64.mk +++ b/target/product/mainline_system_x86_64.mk @@ -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