diff options
| author | Colin Cross <ccross@android.com> | 2014-07-09 22:09:50 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-07-09 22:22:10 -0700 |
| commit | dd2ff5541e9bfcad8e0b9d3cd1275eb4a73d31f4 (patch) | |
| tree | 6060781a1407017e8a2b6bcdcc5425dd524239f6 /core/dex_preopt_libart_boot.mk | |
| parent | c4954f392e94f1877ab77ccef725a26c5d549ed1 (diff) | |
| download | build-dd2ff5541e9bfcad8e0b9d3cd1275eb4a73d31f4.zip build-dd2ff5541e9bfcad8e0b9d3cd1275eb4a73d31f4.tar.gz build-dd2ff5541e9bfcad8e0b9d3cd1275eb4a73d31f4.tar.bz2 | |
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
Diffstat (limited to 'core/dex_preopt_libart_boot.mk')
| -rw-r--r-- | core/dex_preopt_libart_boot.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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)) \ |