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

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

Browse Source
This commit is contained in:
Martin Stjernholm
2021-05-26 18:21:44 +00:00
committed by Gerrit Code Review
parent d33ceee8e9 421990d4a4
commit e2077b5e3b
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

@@ -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