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." am: e2077b5e3b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1714379

Change-Id: I945007b74f2cc408bd0f750b119894de7679543a
This commit is contained in:
Martin Stjernholm
2021-05-26 18:35:06 +00:00
committed by Automerger Merge Worker
parent f81630a8d7 e2077b5e3b
commit 7bfbeba50f
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