From c7fea4809434b1834146c918561da5eae105d499 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Thu, 18 Jul 2024 13:22:07 +0900 Subject: [PATCH] Pass PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD to Soong Pass PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD to Soong so it can decide if ART debug APEX should be used instead of ART APEX Bug: 351698657 Test: AOSP CF eng build succeeded Change-Id: I1e0683be5cd66f1a18e7aec5b1d96ac6e5f4588a --- core/soong_config.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/soong_config.mk b/core/soong_config.mk index 12b41358f7..9be3340eb2 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -361,6 +361,12 @@ $(call add_json_bool, BoardUseVbmetaDigestInFingerprint, $(filter true,$(BOARD_U $(call add_json_list, OemProperties, $(PRODUCT_OEM_PROPERTIES)) +# Do not set ArtTargetIncludeDebugBuild into any value if PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD is not set, +# to have the same behavior from runtime_libart.mk. +ifneq ($(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD),) +$(call add_json_bool, ArtTargetIncludeDebugBuild, $(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD)) +endif + $(call json_end) $(file >$(SOONG_VARIABLES).tmp,$(json_contents))