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.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.mk')
| -rw-r--r-- | core/dex_preopt_libart.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 90ba543..8fc0c67 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -27,14 +27,14 @@ else LIBART_IMG_TARGET_BASE_ADDRESS := 0x70000000 endif -define get-product-property - $(strip $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_PROPERTY_OVERRIDES)))) +define get-product-default-property +$(strip $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES)))) endef -DEX2OAT_IMAGE_XMS := $(get-product-property dalvik.vm.image-dex2oat-Xms) -DEX2OAT_IMAGE_XMX := $(get-product-property dalvik.vm.image-dex2oat-Xmx) -DEX2OAT_XMS := $(get-product-property dalvik.vm.dex2oat-Xms) -DEX2OAT_XMX := $(get-product-property dalvik.vm.dex2oat-Xmx) +DEX2OAT_IMAGE_XMS := $(call get-product-default-property,dalvik.vm.image-dex2oat-Xms) +DEX2OAT_IMAGE_XMX := $(call get-product-default-property,dalvik.vm.image-dex2oat-Xmx) +DEX2OAT_XMS := $(call get-product-default-property,dalvik.vm.dex2oat-Xms) +DEX2OAT_XMX := $(call get-product-default-property,dalvik.vm.dex2oat-Xmx) ######################################################################## # The full system boot classpath @@ -77,7 +77,7 @@ define dex2oat-one-file $(hide) rm -f $(2) $(hide) mkdir -p $(dir $(2)) $(hide) $(DEX2OATD) \ - --runtime-arg $(DEX2OAT_XMS) --runtime-arg $(DEX2OAT_XMX) \ + --runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(DEX2OAT_XMX) \ --boot-image=$(PRIVATE_DEX_PREOPT_IMAGE_LOCATION) \ --dex-file=$(1) \ --dex-location=$(PRIVATE_DEX_LOCATION) \ |