diff options
| author | 2014-04-02 10:34:54 +0000 | |
|---|---|---|
| committer | 2014-04-02 10:34:54 +0000 | |
| commit | 2dc2bf9ad867dfc71bf209dead1315615659e8f9 (patch) | |
| tree | f6f402ae3013cf8b65c15c037d24c39a8aa398a4 | |
| parent | 8e157dc9e2938aa7eeadaf4ea34e8d3e727136bc (diff) | |
| parent | 668e9d870015297e59d29caa38adb249b2c36350 (diff) | |
Merge "Update missed DEX2OAT -> DEX2OATD changes."
| -rw-r--r-- | build/Android.oat.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index c8f201416e..cb45a8529e 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -55,10 +55,10 @@ $(HOST_CORE_IMG_OUT): $(HOST_CORE_DEX_FILES) $(DEX2OATD_DEPENDENCY) $(HOST_CORE_OAT_OUT): $(HOST_CORE_IMG_OUT) define create-oat-target-targets -$$($(1)TARGET_CORE_IMG_OUT): $$($(1)TARGET_CORE_DEX_FILES) $$(DEX2OAT_DEPENDENCY) +$$($(1)TARGET_CORE_IMG_OUT): $$($(1)TARGET_CORE_DEX_FILES) $$(DEX2OATD_DEPENDENCY) @echo "target dex2oat: $$@ ($$?)" @mkdir -p $$(dir $$@) - $$(hide) $$(DEX2OAT) --runtime-arg -Xms16m --runtime-arg -Xmx16m --image-classes=$$(PRELOADED_CLASSES) $$(addprefix \ + $$(hide) $$(DEX2OATD) --runtime-arg -Xms16m --runtime-arg -Xmx16m --image-classes=$$(PRELOADED_CLASSES) $$(addprefix \ --dex-file=,$$(TARGET_CORE_DEX_FILES)) $$(addprefix --dex-location=,$$(TARGET_CORE_DEX_LOCATIONS)) --oat-file=$$($(1)TARGET_CORE_OAT_OUT) \ --oat-location=$$($(1)TARGET_CORE_OAT) --image=$$($(1)TARGET_CORE_IMG_OUT) --base=$$(LIBART_IMG_TARGET_BASE_ADDRESS) \ --instruction-set=$$($(1)TARGET_ARCH) --instruction-set-features=$$(TARGET_INSTRUCTION_SET_FEATURES) --android-root=$$(PRODUCT_OUT)/system |