commit 3df934b8a8d00f021faa8bea139448bf23276d7d
author Lucas Wei <lucaswei@google.com> Mon Apr 12 03:55:46 2021 +0000
committer Nikita Ioffe <ioffe@google.com> Thu Apr 15 15:45:02 2021 +0000
tree a085bba66e6d4015316f1667e299365899c916bb
parent f8283a8bf62c38f4878863de62bb9c8674c30182

Re-land "Enable apex compression on all devices with updatable apex

This reverts commit f8283a8bf62c38f4878863de62bb9c8674c30182.

Test: device boots
Test: OTA from uncompressed apexes to compressed apexes works
Bug: 169780183
Bug: 184746992
Bug: 185082717
Change-Id: I62e379f44a1dcf8ebd2b3448dc1381cd99427b45

target/product/updatable_apex.mk

diff --git a/target/product/updatable_apex.mk b/target/product/updatable_apex.mk
index c8dc8b0..d606e00 100644
--- a/target/product/updatable_apex.mk
+++ b/target/product/updatable_apex.mk
@@ -22,4 +22,9 @@
   PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_prebuilt
   PRODUCT_VENDOR_PROPERTIES := ro.apex.updatable=true
   TARGET_FLATTEN_APEX := false
+  # 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
 endif