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

Commit e2077b5e authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge "Move logic to disable flattening in unbundled app mode from Soong to make."

parents d33ceee8 421990d4

core/board_config.mk

+3 −3
Original line number Diff line number Diff line
@@ -766,8 +766,8 @@ ifeq ($(PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY),true) 
endif



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

# APEXes are by default flattened, i.e. non-updatable.

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

# 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

#

# APEX flattening can also be forcibly enabled (resp. disabled) by
@@ -776,7 +776,7 @@ endif 
ifdef OVERRIDE_TARGET_FLATTEN_APEX

  TARGET_FLATTEN_APEX := $(OVERRIDE_TARGET_FLATTEN_APEX)

else

  ifeq (,$(TARGET_FLATTEN_APEX))

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

    TARGET_FLATTEN_APEX := true

  endif

endif