diff options
| author | Andreas Gampe <agampe@google.com> | 2014-10-24 21:58:16 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-10-28 12:17:16 -0700 |
| commit | 63fc30e201a74dbad9422a6dbd4c39e4b60ac4c5 (patch) | |
| tree | 58176b36024b7a1e9bd561138af0c138cb1602be /Android.mk | |
| parent | 7c1e9d86be5131817505d443e42eaaf962b83524 (diff) | |
| download | art-63fc30e201a74dbad9422a6dbd4c39e4b60ac4c5.zip art-63fc30e201a74dbad9422a6dbd4c39e4b60ac4c5.tar.gz art-63fc30e201a74dbad9422a6dbd4c39e4b60ac4c5.tar.bz2 | |
ART: Create and use multiple core images
Update test infrastructure to understand several core variants.
Now compiles three core.art/oat variants:
* core.art/oat, default-compiled
* core-interpreter.art/oat, interpret-only
* core-optimizing.art/oat, optimizing compiler
The run-test variant implies which core variant is used.
Change-Id: Ieeaf2df90faee2b04c209b950897e77806205fe4
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 20 |
1 files changed, 7 insertions, 13 deletions
@@ -23,6 +23,7 @@ art_path := $(LOCAL_PATH) # include $(art_path)/build/Android.common_path.mk +include $(art_path)/build/Android.oat.mk # Following the example of build's dont_bother for clean targets. art_dont_bother := false @@ -41,20 +42,14 @@ clean-oat: clean-oat-host clean-oat-target .PHONY: clean-oat-host clean-oat-host: - rm -f $(HOST_CORE_IMG_OUT) - rm -f $(HOST_CORE_OAT_OUT) + rm -f $(HOST_CORE_IMG_OUTS) + rm -f $(HOST_CORE_OAT_OUTS) rm -f $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/*.odex ifneq ($(HOST_PREFER_32_BIT),true) - rm -f $(2ND_HOST_CORE_IMG_OUT) - rm -f $(2ND_HOST_CORE_OAT_OUT) rm -f $(HOST_OUT_JAVA_LIBRARIES)/$(2ND_ART_HOST_ARCH)/*.odex endif - rm -f $(TARGET_CORE_IMG_OUT) - rm -f $(TARGET_CORE_OAT_OUT) -ifdef TARGET_2ND_ARCH - rm -f $(2ND_TARGET_CORE_IMG_OUT) - rm -f $(2ND_TARGET_CORE_OAT_OUT) -endif + rm -f $(TARGET_CORE_IMG_OUTS) + rm -f $(TARGET_CORE_OAT_OUTS) rm -rf $(DEXPREOPT_PRODUCT_DIR_FULL_PATH) rm -f $(TARGET_OUT_UNSTRIPPED)/system/framework/*.odex rm -f $(TARGET_OUT_UNSTRIPPED)/system/framework/*/*.oat @@ -109,7 +104,6 @@ include $(art_path)/oatdump/Android.mk include $(art_path)/patchoat/Android.mk include $(art_path)/dalvikvm/Android.mk include $(art_path)/tools/Android.mk -include $(art_path)/build/Android.oat.mk include $(art_path)/sigchainlib/Android.mk @@ -365,10 +359,10 @@ oat-target-sync: oat-target build-art: build-art-host build-art-target .PHONY: build-art-host -build-art-host: $(HOST_OUT_EXECUTABLES)/art $(ART_HOST_DEPENDENCIES) $(HOST_CORE_IMG_OUT) $(2ND_HOST_CORE_IMG_OUT) +build-art-host: $(HOST_OUT_EXECUTABLES)/art $(ART_HOST_DEPENDENCIES) $(HOST_CORE_IMG_OUTS) .PHONY: build-art-target -build-art-target: $(TARGET_OUT_EXECUTABLES)/art $(ART_TARGET_DEPENDENCIES) $(TARGET_CORE_IMG_OUT) $(2ND_TARGET_CORE_IMG_OUT) +build-art-target: $(TARGET_OUT_EXECUTABLES)/art $(ART_TARGET_DEPENDENCIES) $(TARGET_CORE_IMG_OUTS) ######################################################################## # targets to switch back and forth from libdvm to libart |