Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8a1d92f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Fix the build system to pass "-Xgc:CMC" to dex2oat correctly." am: 8497cfd6 am: bd703c3f am: 033420d4

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



Change-Id: Id704092d954036dfbc5476cd1375fa6aade927b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab92b829 033420d4

core/dex_preopt_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)