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

Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57

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

Change-Id: I8b594224eace23296b5b9a8a7d6a16d5b14b9f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2023-03-20 20:28:26 +00:00
committed by Automerger Merge Worker
parent d90bc8e5ee 14108b6a57
commit 299878fb17
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/board_config.mk
View File

@@ -996,19 +996,13 @@ ifeq ($(PRODUCT_ENFORCE_INTER_PARTITION_JAVA_SDK_LIBRARY),true)
endif endif
########################################### ###########################################
# APEXes are by default flattened, i.e. non-updatable, if not building unbundled # APEXes are by default not flattened, i.e. updatable.
# apps. It can be unflattened (and updatable) by inheriting from
# updatable_apex.mk
# #
# APEX flattening can also be forcibly enabled (resp. disabled) by # APEX flattening can also be forcibly enabled (resp. disabled) by
# setting OVERRIDE_TARGET_FLATTEN_APEX to true (resp. false), e.g. by # setting OVERRIDE_TARGET_FLATTEN_APEX to true (resp. false), e.g. by
# setting the OVERRIDE_TARGET_FLATTEN_APEX environment variable. # setting the OVERRIDE_TARGET_FLATTEN_APEX environment variable.
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
ifeq (,$(TARGET_BUILD_APPS)$(TARGET_FLATTEN_APEX))
TARGET_FLATTEN_APEX := true
endif
endif endif
ifeq (,$(TARGET_BUILD_UNBUNDLED)) ifeq (,$(TARGET_BUILD_UNBUNDLED))