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

Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: Ide054683665fe88e04f46f607b7408f1b7ccda01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han
2023-08-28 01:03:27 +00:00
committed by Automerger Merge Worker
parent a1c288f36a 5d7f9cb2a1
commit db3c1b173f
4 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/Makefile
View File

@@ -5775,9 +5775,6 @@ endif
ifeq ($(BUILDING_WITH_VSDK),true)
$(hide) echo "building_with_vsdk=true" >> $@
endif
ifeq ($(TARGET_FLATTEN_APEX),false)
$(hide) echo "target_flatten_apex=false" >> $@
endif
$(call declare-0p-target,$(INSTALLED_FASTBOOT_INFO_TARGET))

18
core/board_config.mk
View File

@@ -971,24 +971,6 @@ ifneq ($(BOARD_VNDK_VERSION),current)
endif
TARGET_VENDOR_TEST_SUFFIX := /vendor
###########################################
# APEXes are by default not flattened, i.e. updatable.
#
# APEX flattening can also be forcibly enabled (resp. disabled) by
# setting OVERRIDE_TARGET_FLATTEN_APEX to true (resp. false), e.g. by
# setting the OVERRIDE_TARGET_FLATTEN_APEX environment variable.
ifdef OVERRIDE_TARGET_FLATTEN_APEX
TARGET_FLATTEN_APEX := $(OVERRIDE_TARGET_FLATTEN_APEX)
endif
# TODO(b/278826656) Remove the following message
ifeq (true,$(TARGET_FLATTEN_APEX))
$(warning ********************************************************************************)
$(warning Flattened APEX will be deprecated soon. Please stop using flattened APEX and use)
$(warning "image" APEX instead.)
$(warning ********************************************************************************)
endif
ifeq (,$(TARGET_BUILD_UNBUNDLED))
ifdef PRODUCT_EXTRA_VNDK_VERSIONS
$(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v)))