diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-14 17:44:28 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-16 16:14:50 -0700 |
| commit | 0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53 (patch) | |
| tree | aba31f1d671b4816fb63fca00b985ab0d2b6a12b /Android.mk | |
| parent | de1129a26e0474ea8bb9112938ebb867163969fd (diff) | |
| download | art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.zip art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.tar.gz art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.tar.bz2 | |
Add ISA directory to image and odex pathnames.
Bug: 14882223
Bug: 14694978
Change-Id: Ic1b5ae836b8e91ea461dcd4f3da8e38dc3bec00f
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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 |