| commit | 225c4767ac4d19fed88f481edcafe5a220ca9ea0 | [log] [tgz] |
|---|---|---|
| author | Jiakai Zhang <jiakaiz@google.com> | Thu Jun 01 14:17:03 2023 +0100 |
| committer | Jiakai Zhang <jiakaiz@google.com> | Thu Jun 01 13:27:25 2023 +0000 |
| tree | 1ff52d96a1c18976031655f3c9299196ac5ee077 | |
| parent | 02e8a0dba151c843620ebaa3faf7d3365c676a98 [diff] [blame] |
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
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 116c833..35f6097 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go
@@ -816,7 +816,7 @@ 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") }