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

Commit c207ebfe authored by Mohammad Islam's avatar Mohammad Islam Committed by Automerger Merge Worker
Browse files

Merge "Add a product flag that will enable compressed APEX on device" am: 0a246e5e am: b2568c47 

Original change: https://android-review.googlesource.com/c/platform/build/+/1512289

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50e39b83f797b8fa15746b1c0f4c8983186a9109
parents da657b1c b2568c47

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -321,6 +321,9 @@ _product_single_value_vars += PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE 
# List of extra VNDK versions to be included

_product_list_vars += PRODUCT_EXTRA_VNDK_VERSIONS



# Whether APEX should be compressed or not

_product_single_value_vars += PRODUCT_COMPRESSED_APEX



# VNDK version of product partition. It can be 'current' if the product

# partitions uses PLATFORM_VNDK_VERSION.

_product_single_value_vars += PRODUCT_PRODUCT_VNDK_VERSION

core/product_config.mk

+10 −0
Original line number Diff line number Diff line
@@ -355,6 +355,16 @@ ifdef OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS 
  PRODUCT_EXTRA_VNDK_VERSIONS := $(OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS)

endif



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

# APEXes are by default not compressed

#

# 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)

endif



$(KATI_obsolete_var OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS \

    ,Use PRODUCT_EXTRA_VNDK_VERSIONS instead)

core/soong_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ $(call add_json_list, InterPartitionJavaLibraryAllowList, $(PRODUCT_INTER_PARTIT 


$(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES))



$(call add_json_bool, CompressedApex, $(PRODUCT_COMPRESSED_APEX))



$(call add_json_bool, BoardUsesRecoveryAsBoot, $(BOARD_USES_RECOVERY_AS_BOOT))



$(call add_json_list, BoardKernelBinaries, $(BOARD_KERNEL_BINARIES))