From dd2ff5541e9bfcad8e0b9d3cd1275eb4a73d31f4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 9 Jul 2014 22:09:50 -0700 Subject: build: fix host dex2oat runtime args The dalvik.vm.* properties are in PRODUCT_DEFAULT_PROPERTY_OVERRIDES, not PRODUCT_PROPERTY_OVERRIDES. Use $(call func,args) for user defined functions Prepend the property contents with -Xms or -Xmx when passing to dex2oat. This only worked before because DEX2OAT_XMS, etc. were blank due to the first two bugs, which resulted in --runtime-arg --runtime-arg and anything starting with -- as the argument to --runtime-arg is silently ignored. Change-Id: Ifa30038b397355171fefcc5248eea033bb634036 --- core/dex_preopt_libart_boot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/dex_preopt_libart_boot.mk') diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index e48e3f9..7eefc0b 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -43,7 +43,7 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE @echo "target dex2oat: $@ ($?)" @mkdir -p $(dir $@) @mkdir -p $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED)) - $(hide) $(DEX2OATD) --runtime-arg $(DEX2OAT_IMAGE_XMS) --runtime-arg $(DEX2OAT_IMAGE_XMX) \ + $(hide) $(DEX2OATD) --runtime-arg -Xms$(DEX2OAT_IMAGE_XMS) --runtime-arg -Xmx$(DEX2OAT_IMAGE_XMX) \ --image-classes=$(PRELOADED_CLASSES) \ $(addprefix --dex-file=,$(LIBART_TARGET_BOOT_DEX_FILES)) \ $(addprefix --dex-location=,$(LIBART_TARGET_BOOT_DEX_LOCATIONS)) \ -- cgit v1.1