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

Commit 68196595 authored by Jooyung Han's avatar Jooyung Han
Browse files

Make PRODUCT_COMPRESSED_APEX configurable in device.mk 

Even though PRODUCT_COMPRESSED_APEX is a hint to use compressed APEXes,
setting it in device.mk is not respected because it's set in
updatable_apex.mk.

Now the variable is set in product_config.mk unless it's set. (default
to true to keep the behavior)

(minor fix in updatable_apex's PRODUCT_SYSTEM_PROPERTIES)

Bug: 406910790
Test: PRODUCT_COMPRESSED_APEX := false in device.mk and build
Change-Id: I935867bbc36dd809a0d3cdee2fb4bf16daff6602
parent 197075a4

core/product_config.mk

+7 −1
Original line number Diff line number Diff line
@@ -532,13 +532,19 @@ ifdef OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS 
endif



###########################################

# APEXes are by default not compressed

# PRODUCT_COMPRESSED_APEX: Use compressed apexes in pre-installed partitions.

#

# Note: this doesn't mean that all pre-installed apexes will be compressed.

#  Whether an apex is compressed or not is controlled at apex Soong module

#  via compresible property.

#

# APEX compression can be forcibly enabled (resp. disabled) by

# setting OVERRIDE_PRODUCT_COMPRESSED_APEX to true (resp. false), e.g. by

# setting the OVERRIDE_PRODUCT_COMPRESSED_APEX environment variable.

ifdef OVERRIDE_PRODUCT_COMPRESSED_APEX

  PRODUCT_COMPRESSED_APEX := $(OVERRIDE_PRODUCT_COMPRESSED_APEX)

else ifeq (,$(PRODUCT_COMPRESSED_APEX))

  PRODUCT_COMPRESSED_APEX := true

endif



ifdef OVERRIDE_PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE

target/product/updatable_apex.mk

+1 −7
Original line number Diff line number Diff line
@@ -17,10 +17,4 @@ 
# com.android.apex.cts.shim.v1_prebuilt overrides CtsShimPrebuilt

# and CtsShimPrivPrebuilt since they are packaged inside the APEX.

PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_prebuilt

PRODUCT_SYSTEM_PROPERTIES := ro.apex.updatable=true



# Use compressed apexes in pre-installed partitions.

# Note: this doesn't mean that all pre-installed apexes will be compressed.

#  Whether an apex is compressed or not is controlled at apex Soong module

#  via compresible property.

PRODUCT_COMPRESSED_APEX := true
 
PRODUCT_SYSTEM_PROPERTIES += ro.apex.updatable=true