commit 4a30e138e24268e7bcc67d429f35a331b13b702d
author Jiakai Zhang <jiakaiz@google.com> Wed Nov 23 11:20:29 2022 +0000
committer Jiakai Zhang <jiakaiz@google.com> Wed Nov 23 11:28:20 2022 +0000
tree 2413b957ebefc3cf5fdc2a6e073877f85f1cea98
parent 7e34ad149ff634d55d418c4f081e69525df8b7dc

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

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)