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

Commit 421990d4 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Move logic to disable flattening in unbundled app mode from Soong to 

make.

Avoids TARGET_FLATTEN_APEX lying about it, so we can trust it in
scripts, e.g. in art/build/apex/runtests.sh.

Test: banchan com.android.art; art/build/apex/runtests.sh
Bug: 179900989
Change-Id: I5d3226047e51a51ee76de2cbfad050e200568655
parent e9423b0b

core/board_config.mk

+3 −3
Original line number Diff line number Diff line
@@ -764,8 +764,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
@@ -774,7 +774,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