From 4a30e138e24268e7bcc67d429f35a331b13b702d Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Wed, 23 Nov 2022 11:20:29 +0000 Subject: [PATCH] Fix the build system to pass "-Xgc:CMC" to dex2oat correctly. Bug: 242553398 Test: - 1. lunch aosp_oriole-userdebug 2. m 3. Don't see "--runtime-arg -Xgc:CMC" in .invocation files. Test: - 1. lunch aosp_oriole-userdebug 2. OVERRIDE_ENABLE_UFFD_GC=true m 3. See "--runtime-arg -Xgc:CMC" in .invocation files. Change-Id: If1c2c5feecc8148a0e2fa6a0e0b23641945f5b1d --- core/dex_preopt_config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index ea8389a942..e36e2ebb6f 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -130,7 +130,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) $(call add_json_str, Dex2oatXmx, $(DEX2OAT_XMX)) $(call add_json_str, Dex2oatXms, $(DEX2OAT_XMS)) $(call add_json_str, EmptyDirectory, $(OUT_DIR)/empty) - $(call add_json_bool, EnableUffdGc, $(ENABLE_UFFD_GC)) + $(call add_json_bool, EnableUffdGc, $(filter true,$(ENABLE_UFFD_GC))) ifdef TARGET_ARCH $(call add_json_map, CpuVariant)