diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-07-28 23:12:58 +0000 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-08-06 09:40:48 -0700 |
| commit | 3d4e684d05a43bb7ae182112b58bd8322fd64b2b (patch) | |
| tree | 04234183b9a2ae7e0a2a89f7c495c77a1fbc529e | |
| parent | 38449637b1ee8209e2eb81b3f27f40bb9ab3934f (diff) | |
| download | art-3d4e684d05a43bb7ae182112b58bd8322fd64b2b.zip art-3d4e684d05a43bb7ae182112b58bd8322fd64b2b.tar.gz art-3d4e684d05a43bb7ae182112b58bd8322fd64b2b.tar.bz2 | |
Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."
This reverts commit b1efe9746724f28773d185c7137c16ca8207ed47.
Change-Id: I5af2fae2c7b72e6ded72f00d3f7d4f306f6703ee
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | build/Android.oat.mk | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -309,7 +309,7 @@ else .PHONY: oat-target-$(1) oat-target-$(1): $$(OUT_OAT_FILE) -$$(OUT_OAT_FILE): $(PRODUCT_OUT)/$(1) $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) $(DEX2OATD) +$$(OUT_OAT_FILE): $(PRODUCT_OUT)/$(1) $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) $(DEX2OATD_DEPENDENCY) @mkdir -p $$(dir $$@) $(DEX2OATD) --runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(DEX2OAT_XMX) \ --boot-image=$(DEFAULT_DEX_PREOPT_BUILT_IMAGE) --dex-file=$(PRODUCT_OUT)/$(1) \ diff --git a/build/Android.oat.mk b/build/Android.oat.mk index cd6b13a..10936a4 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -26,7 +26,7 @@ include art/build/Android.common_path.mk # Use dex2oat debug version for better error reporting # $(1): 2ND_ or undefined, 2ND_ for 32-bit host builds. define create-core-oat-host-rules -$$($(1)HOST_CORE_IMG_OUT): $$(HOST_CORE_DEX_FILES) $$(DEX2OATD) +$$($(1)HOST_CORE_IMG_OUT): $$(HOST_CORE_DEX_FILES) $$(DEX2OATD_DEPENDENCY) @echo "host dex2oat: $$@ ($$?)" @mkdir -p $$(dir $$@) $$(hide) $$(DEX2OATD) --runtime-arg -Xms$(DEX2OAT_IMAGE_XMS) --runtime-arg -Xmx$(DEX2OAT_IMAGE_XMX) \ @@ -49,7 +49,7 @@ $(eval $(call create-core-oat-host-rules,2ND_)) endif define create-core-oat-target-rules -$$($(1)TARGET_CORE_IMG_OUT): $$($(1)TARGET_CORE_DEX_FILES) $$(DEX2OATD) +$$($(1)TARGET_CORE_IMG_OUT): $$($(1)TARGET_CORE_DEX_FILES) $$(DEX2OATD_DEPENDENCY) @echo "target dex2oat: $$@ ($$?)" @mkdir -p $$(dir $$@) $$(hide) $$(DEX2OATD) --runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(DEX2OAT_XMX) \ |