Merge "Fix the build system to pass "-Xgc:CMC" to dex2oat correctly." am: 8497cfd66e
Original change: https://android-review.googlesource.com/c/platform/build/+/2312212 Change-Id: I8337a911ef3a0710301ce072dd8e27e76abd3372 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -130,7 +130,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
|
|||||||
$(call add_json_str, Dex2oatXmx, $(DEX2OAT_XMX))
|
$(call add_json_str, Dex2oatXmx, $(DEX2OAT_XMX))
|
||||||
$(call add_json_str, Dex2oatXms, $(DEX2OAT_XMS))
|
$(call add_json_str, Dex2oatXms, $(DEX2OAT_XMS))
|
||||||
$(call add_json_str, EmptyDirectory, $(OUT_DIR)/empty)
|
$(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
|
ifdef TARGET_ARCH
|
||||||
$(call add_json_map, CpuVariant)
|
$(call add_json_map, CpuVariant)
|
||||||
|
Reference in New Issue
Block a user