StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Martin Stjernholm
2021-05-25 00:24:51 +01:00
parent e9423b0b09
commit 421990d4a4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/board_config.mk
View File

@@ -764,8 +764,8 @@ ifeq ($(PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY),true)
endif endif
########################################### ###########################################
# APEXes are by default flattened, i.e. non-updatable. # APEXes are by default flattened, i.e. non-updatable, if not building unbundled
# It can be unflattened (and updatable) by inheriting from # apps. 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 # APEX flattening can also be forcibly enabled (resp. disabled) by
@@ -774,7 +774,7 @@ endif
ifdef OVERRIDE_TARGET_FLATTEN_APEX ifdef OVERRIDE_TARGET_FLATTEN_APEX
TARGET_FLATTEN_APEX := $(OVERRIDE_TARGET_FLATTEN_APEX) TARGET_FLATTEN_APEX := $(OVERRIDE_TARGET_FLATTEN_APEX)
else else
ifeq (,$(TARGET_FLATTEN_APEX)) ifeq (,$(TARGET_BUILD_APPS)$(TARGET_FLATTEN_APEX))
TARGET_FLATTEN_APEX := true TARGET_FLATTEN_APEX := true
endif endif
endif endif