commit 106e11cfe79721deca70ec84e433ce02ca5392b9
author Anton Hansson <hansson@google.com> Fri Apr 16 10:04:29 2021 +0100
committer Anton Hansson <hansson@google.com> Fri Apr 16 10:09:58 2021 +0100
tree 43f36735156c4602fb3b3666707bf8b7ea8d2645
parent 4cce23d7d5b0d609d6d122a519f7eccf774d492d

Fix soong_config handling of CompressedApex

add_json_bool treats non-empty variable as "true" by default (which is
conventional in make). Fix treatment of PRODUCT_COMPRESSED_APEX to
support the value false.

Bug: 185537646
Test: OVERRIDE_PRODUCT_COMPRESSED_APEX=false m nothing && \
      grep CompressedApex out/soong/soong.variables
Change-Id: I0562a375be377ab67a1d064e37aff5970c4ac8dd

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 17176df..ec67560 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -240,7 +240,7 @@
 
 $(call add_json_bool, InstallExtraFlattenedApexes, $(PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES))
 
-$(call add_json_bool, CompressedApex, $(PRODUCT_COMPRESSED_APEX))
+$(call add_json_bool, CompressedApex, $(filter true,$(PRODUCT_COMPRESSED_APEX)))
 
 $(call add_json_bool, BoardUsesRecoveryAsBoot, $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)))