From 106e11cfe79721deca70ec84e433ce02ca5392b9 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 16 Apr 2021 10:04:29 +0100 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/soong_config.mk b/core/soong_config.mk index 17176df7f5..ec67560aa0 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -240,7 +240,7 @@ $(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, CompressedApex, $(filter true,$(PRODUCT_COMPRESSED_APEX))) $(call add_json_bool, BoardUsesRecoveryAsBoot, $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)))