diff options
| -rw-r--r-- | build/Android.common_path.mk | 6 | ||||
| -rw-r--r-- | oatdump/Android.mk | 24 |
2 files changed, 23 insertions, 7 deletions
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index 2d6b6a3cbf..183f4e3ec3 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -41,7 +41,7 @@ else ART_HOST_TEST_DIR := /tmp/test-art-$(shell echo $$PPID) endif -# Core.oat location on the device. +# core.oat location on the device. TARGET_CORE_OAT := $(ART_TARGET_TEST_DIR)/$(DEX2OAT_TARGET_ARCH)/core.oat ifdef TARGET_2ND_ARCH 2ND_TARGET_CORE_OAT := $(ART_TARGET_TEST_DIR)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)/core.oat @@ -49,7 +49,7 @@ endif CORE_OAT_SUFFIX := .oat -# Core.oat locations under the out directory. +# core.oat locations under the out directory. HOST_CORE_OAT_OUT_BASE := $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/core ifneq ($(HOST_PREFER_32_BIT),true) 2ND_HOST_CORE_OAT_OUT_BASE := $(HOST_OUT_JAVA_LIBRARIES)/$(2ND_ART_HOST_ARCH)/core @@ -63,7 +63,7 @@ TARGET_CORE_OAT_OUTS := CORE_IMG_SUFFIX := .art -# Core.art locations under the out directory. +# core.art locations under the out directory. HOST_CORE_IMG_OUT_BASE := $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/core ifneq ($(HOST_PREFER_32_BIT),true) 2ND_HOST_CORE_IMG_OUT_BASE := $(HOST_OUT_JAVA_LIBRARIES)/$(2ND_ART_HOST_ARCH)/core diff --git a/oatdump/Android.mk b/oatdump/Android.mk index f01afc541d..a3ef38db85 100644 --- a/oatdump/Android.mk +++ b/oatdump/Android.mk @@ -47,12 +47,28 @@ dump-oat-core-host: $(HOST_CORE_IMG_OUTS) $(OATDUMP) @echo Output in $(ART_DUMP_OAT_PATH)/core.host.oatdump.txt endif -.PHONY: dump-oat-core-target +.PHONY: dump-oat-core-target-$(TARGET_ARCH) +ifeq ($(ART_BUILD_TARGET),true) +dump-oat-core-target-$(TARGET_ARCH): $(TARGET_CORE_IMAGE_default_no-pic_$(ART_PHONY_TEST_TARGET_SUFFIX)) $(OATDUMP) + $(OATDUMP) --image=$(TARGET_CORE_IMG_LOCATION) \ + --output=$(ART_DUMP_OAT_PATH)/core.target.$(TARGET_ARCH).oatdump.txt --instruction-set=$(TARGET_ARCH) + @echo Output in $(ART_DUMP_OAT_PATH)/core.target.$(TARGET_ARCH).oatdump.txt +endif + +ifdef TARGET_2ND_ARCH +.PHONY: dump-oat-core-target-$(TARGET_2ND_ARCH) ifeq ($(ART_BUILD_TARGET),true) -dump-oat-core-target: $(TARGET_CORE_IMAGE_default_no-pic_32) $(OATDUMP) +dump-oat-core-target-$(TARGET_2ND_ARCH): $(TARGET_CORE_IMAGE_default_no-pic_$(2ND_ART_PHONY_TEST_TARGET_SUFFIX)) $(OATDUMP) $(OATDUMP) --image=$(TARGET_CORE_IMG_LOCATION) \ - --output=$(ART_DUMP_OAT_PATH)/core.target.oatdump.txt --instruction-set=$(TARGET_ARCH) - @echo Output in $(ART_DUMP_OAT_PATH)/core.target.oatdump.txt + --output=$(ART_DUMP_OAT_PATH)/core.target.$(TARGET_2ND_ARCH).oatdump.txt --instruction-set=$(TARGET_2ND_ARCH) + @echo Output in $(ART_DUMP_OAT_PATH)/core.target.$(TARGET_2ND_ARCH).oatdump.txt +endif +endif + +.PHONY: dump-oat-core-target +dump-oat-core-target: dump-oat-core-target-$(TARGET_ARCH) +ifdef TARGET_2ND_ARCH +dump-oat-core-target: dump-oat-core-target-$(TARGET_2ND_ARCH) endif .PHONY: dump-oat-boot-$(TARGET_ARCH) |