commit bd703c3fa3c39eb95ffba486bd3d5d2998863ad0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 23 15:28:27 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 23 15:28:27 2022 +0000
tree 7b2310b7a2e321e40f69215ea9c82f76a2e080d7
parent 77de388407c0e01127b882ea7994c7e6f4ab1637
parent 8497cfd66e9c6b191f3be430e79b3b2ecbab26d6

Merge "Fix the build system to pass "-Xgc:CMC" to dex2oat correctly." am: 8497cfd66e

Original change: https://android-review.googlesource.com/c/platform/build/+/2312212

Change-Id: I8337a911ef3a0710301ce072dd8e27e76abd3372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/dex_preopt_config.mk

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index ea8389a..e36e2eb 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -130,7 +130,7 @@
   $(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)