From 225c4767ac4d19fed88f481edcafe5a220ca9ea0 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Thu, 1 Jun 2023 14:17:03 +0100 Subject: [PATCH] Only pass "-Xgc:CMC" when building for Android. The runtime always uses CC on host unless CMC is explicitly asked (http://cs/android-internal/art/runtime/gc/collector/mark_compact.cc;l=212-214;rcl=50fe05b4f4650bc0888d2c218a1bfa476f811ea0). This CL matches the build system behavior with the runtime. Bug: 285228269 Test: m test-art-host-gtest-art_dex2oat_tests Change-Id: I652ad6f754ab8c51283e5fb0e9e1ba644629fa11 --- java/dexpreopt_bootjars.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 116c833e0..35f60979f 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -816,7 +816,7 @@ func buildBootImageVariant(ctx android.ModuleContext, image *bootImageVariant, p cmd.FlagWithArg("--instruction-set-features=", global.InstructionSetFeatures[arch]) } - if global.EnableUffdGc { + if global.EnableUffdGc && image.target.Os == android.Android { cmd.Flag("--runtime-arg").Flag("-Xgc:CMC") }