tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Introduce build variable OVERRIDE_TARGET_FLATTEN_APEX." am: 81681abfef am: 0a24633ef5 am: 6a3e54b47f

Browse source 
am: 824989bee6

Change-Id: Iaeb8684bf93e3d277239958d3b8086f0e855d0f5
This commit is contained in:
Roland Levillain 2019-10-07 03:53:30 -07:00 committed by android-build-merger
commit fe4671d8f9
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/board_config.mk
View file

@ -584,9 +584,17 @@ endif
# APEXes are by default flattened, i.e. non-updatable. # APEXes are by default flattened, i.e. non-updatable.
# It can be unflattened (and updatable) by inheriting from # It can be unflattened (and updatable) by inheriting from
# updatable_apex.mk # updatable_apex.mk
#
# 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)
else
ifeq (,$(TARGET_FLATTEN_APEX)) ifeq (,$(TARGET_FLATTEN_APEX))
TARGET_FLATTEN_APEX := true TARGET_FLATTEN_APEX := true
endif endif
endif
ifeq (,$(TARGET_BUILD_APPS)) ifeq (,$(TARGET_BUILD_APPS))
ifdef PRODUCT_EXTRA_VNDK_VERSIONS ifdef PRODUCT_EXTRA_VNDK_VERSIONS

2
target/product/updatable_apex.mk
View file

@ -16,5 +16,7 @@
# Inherit this when the target needs to support updating APEXes # Inherit this when the target needs to support updating APEXes
ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true)
PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true
TARGET_FLATTEN_APEX := false TARGET_FLATTEN_APEX := false
endif