diff options
| author | Jiakai Zhang <jiakaiz@google.com> | 2023-06-20 14:38:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-20 14:38:23 +0000 |
| commit | 9778268c87a378e0cf1c75aa0c6797758ad64897 (patch) | |
| tree | 2a0811f6f4730a92c9039d52fb3d1e6db9bcbd07 | |
| parent | 7f298d8a1a09856eb98a52530dfe418e57798df4 (diff) | |
| parent | bedc1d3518f027a403ab582767c5a9cf6cf16578 (diff) | |
| download | build-9778268c87a378e0cf1c75aa0c6797758ad64897.tar.gz | |
Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038
Change-Id: I02e2fae8e1707fbb11b76bfad7c364527b855bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/dex_preopt.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 86ca7299b6..6ac169b701 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -94,6 +94,7 @@ booclasspath_arg := $(subst $(space),:,$(patsubst $(dexpreopt_root_dir)%,%,$(DEX booclasspath_locations_arg := $(subst $(space),:,$(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS)) boot_images := $(subst :,$(space),$(DEXPREOPT_IMAGE_LOCATIONS_ON_DEVICE$(DEXPREOPT_INFIX))) boot_image_arg := $(subst $(space),:,$(patsubst /%,%,$(boot_images))) +dex2oat_extra_args := $(if $(filter true,$(ENABLE_UFFD_GC)),--runtime-arg -Xgc:CMC) boot_zip_metadata_txt := $(dir $(boot_zip))boot_zip/METADATA.txt $(boot_zip_metadata_txt): @@ -101,6 +102,7 @@ $(boot_zip_metadata_txt): echo "booclasspath = $(booclasspath_arg)" >> $@ echo "booclasspath-locations = $(booclasspath_locations_arg)" >> $@ echo "boot-image = $(boot_image_arg)" >> $@ + echo "extra-args = $(dex2oat_extra_args)" >> $@ $(call dist-for-goals, droidcore, $(boot_zip_metadata_txt)) |