Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe4671d8 authored by Roland Levillain's avatar Roland Levillain Committed by android-build-merger
Browse files

Merge "Introduce build variable `OVERRIDE_TARGET_FLATTEN_APEX`." am:... 

Merge "Introduce build variable `OVERRIDE_TARGET_FLATTEN_APEX`." am: 81681abf am: 0a24633e am: 6a3e54b4
am: 824989be

Change-Id: Iaeb8684bf93e3d277239958d3b8086f0e855d0f5
parents 20c4575a 824989be

core/board_config.mk

+10 −2
Original line number Diff line number Diff line
@@ -584,9 +584,17 @@ endif 
# APEXes are by default flattened, i.e. non-updatable.

# It can be unflattened (and updatable) by inheriting from

# 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))

    TARGET_FLATTEN_APEX := true

  endif

endif



ifeq (,$(TARGET_BUILD_APPS))

ifdef PRODUCT_EXTRA_VNDK_VERSIONS

target/product/updatable_apex.mk

+4 −2
Original line number Diff line number Diff line
@@ -16,5 +16,7 @@ 


# Inherit this when the target needs to support updating APEXes



ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true)

  PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true

  TARGET_FLATTEN_APEX := false

endif