diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-02-07 12:09:09 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2012-02-07 13:01:28 -0800 |
| commit | bd411021057416e56a1544b98831b92faf66a1a1 (patch) | |
| tree | df8515d553d7d6169218cff05ba8e137a825f916 /build | |
| parent | 17165ef481abc838e761239d4453b00d01be4f49 (diff) | |
| download | art-bd411021057416e56a1544b98831b92faf66a1a1.zip art-bd411021057416e56a1544b98831b92faf66a1a1.tar.gz art-bd411021057416e56a1544b98831b92faf66a1a1.tar.bz2 | |
trygon support
Change-Id: I27ff7e26b583614f2577aed79dcd629ad4595e63
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.common.mk | 5 | ||||
| -rw-r--r-- | build/Android.oat.mk | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index d233ab0..26d4d22 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -18,6 +18,11 @@ ART_CACHE_DIR := /data/art-cache ART_CACHE_OUT := $(TARGET_OUT_DATA)/art-cache +# $(1): pathname +define art-cache-out +$(ART_CACHE_OUT)/$(subst /,@,$(1)) +endef + # directory used for gtests on device ART_NATIVETEST_DIR := /data/nativetest/art ART_NATIVETEST_OUT := $(TARGET_OUT_DATA_NATIVE_TESTS)/art diff --git a/build/Android.oat.mk b/build/Android.oat.mk index a1c2449..4f1bb2d 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -66,8 +66,13 @@ $(TARGET_CORE_IMG): $(TARGET_CORE_OAT) # The full system boot classpath TARGET_BOOT_JARS := $(subst :, ,$(DEXPREOPT_BOOT_JARS)) TARGET_BOOT_DEX := $(foreach jar,$(TARGET_BOOT_JARS),$(TARGET_OUT_JAVA_LIBRARIES)/$(jar).jar) -TARGET_BOOT_OAT := $(TARGET_OUT_JAVA_LIBRARIES)/boot.oat -TARGET_BOOT_IMG := $(TARGET_OUT_JAVA_LIBRARIES)/boot.art +ifeq ($(TARGET_PRODUCT),$(filter $(TARGET_PRODUCT),trygon)) + TARGET_BOOT_OAT := $(call art-cache-out,$(DEXPREOPT_BOOT_JAR_DIR)/boot.oat) + TARGET_BOOT_IMG := $(call art-cache-out,$(DEXPREOPT_BOOT_JAR_DIR)/boot.art) +else + TARGET_BOOT_OAT := $(TARGET_OUT_JAVA_LIBRARIES)/boot.oat + TARGET_BOOT_IMG := $(TARGET_OUT_JAVA_LIBRARIES)/boot.art +endif $(TARGET_BOOT_OAT): $(TARGET_BOOT_DEX) $(DEX2OAT_DEPENDENCY) @echo "target dex2oat: $@ ($?)" |