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

Commit bfbb7718 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a am: 299878fb 

Original change: https://android-review.googlesource.com/c/platform/build/+/2491212



Change-Id: Ie773663bd3cd5770af0e754ee29c9f411d574244
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96a1cfe6 299878fb

core/board_config.mk

+1 −7
Original line number Diff line number Diff line
@@ -996,19 +996,13 @@ ifeq ($(PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY),true) 
endif



###########################################

# APEXes are by default flattened, i.e. non-updatable, if not building unbundled

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

# updatable_apex.mk

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

else

  ifeq (,$(TARGET_BUILD_APPS)$(TARGET_FLATTEN_APEX))

    TARGET_FLATTEN_APEX := true

  endif

endif



ifeq (,$(TARGET_BUILD_UNBUNDLED))