From 0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Wed, 14 May 2014 17:44:28 -0700 Subject: Add ISA directory to image and odex pathnames. Bug: 14882223 Bug: 14694978 Change-Id: Ic1b5ae836b8e91ea461dcd4f3da8e38dc3bec00f --- Android.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 57185ca..3d65f6d 100644 --- a/Android.mk +++ b/Android.mk @@ -241,10 +241,9 @@ test-art-target$(1): test-art-target-gtest$(1) test-art-target-oat$(1) test-art- endef $(eval $(call call-art-multi-target-rule,declare-test-art-target,test-art-target)) - define declare-test-art-target-dependencies .PHONY: test-art-target-dependencies$(1) -test-art-target-dependencies$(1): $(ART_TARGET_TEST_DEPENDENCIES$(1)) $(ART_TEST_OUT)/libarttest.so +test-art-target-dependencies$(1): $(ART_TARGET_TEST_DEPENDENCIES$(1)) $(ART_TARGET_LIBARTTEST_$(1)) endef $(eval $(call call-art-multi-target-rule,declare-test-art-target-dependencies,test-art-target-dependencies)) @@ -404,7 +403,7 @@ dump-oat-core: dump-oat-core-host dump-oat-core-target .PHONY: dump-oat-core-host ifeq ($(ART_BUILD_HOST),true) dump-oat-core-host: $(HOST_CORE_IMG_OUT) $(OATDUMP) - $(OATDUMP) --image=$(HOST_CORE_IMG_OUT) --output=$(ART_DUMP_OAT_PATH)/core.host.oatdump.txt + $(OATDUMP) --image=$(HOST_CORE_IMG_LOCATION) --output=$(ART_DUMP_OAT_PATH)/core.host.oatdump.txt @echo Output in $(ART_DUMP_OAT_PATH)/core.host.oatdump.txt endif -- cgit v1.1