commit 29e7ac74a3f9aec192099fec381baadaa55730ad
author Brian Carlstrom <bdc@google.com> Mon Dec 05 23:42:57 2011 -0800
committer Brian Carlstrom <bdc@google.com> Wed Dec 14 11:02:24 2011 -0800
tree 350ef2b28d55411a31b838159191bf461aec03da
parent 4d3c95bd7ee7d67993dc09617ee4138fa33af70f

Moving from libdvm to libart (1 of 5)

Change-Id: I6541802c5f403a4ba4424818084b94bebe71dfca

build/Android.oat.mk

diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 0995356..a87de97 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -66,8 +66,8 @@
 # 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 := $(ART_CACHE_OUT)/boot.oat
-TARGET_BOOT_IMG := $(ART_CACHE_OUT)/boot.art
+TARGET_BOOT_OAT := $(TARGET_OUT_JAVA_LIBRARIES)/boot.oat
+TARGET_BOOT_IMG := $(TARGET_OUT_JAVA_LIBRARIES)/boot.art
 
 $(TARGET_BOOT_OAT): $(TARGET_BOOT_DEX) $(DEX2OAT_DEPENDENCY)
 	@echo "target dex2oat: $@ ($?)"
@@ -75,3 +75,9 @@
 	$(hide) $(DEX2OAT) --runtime-arg -Xms256m --runtime-arg -Xmx256m --image-classes=$(PRELOADED_CLASSES) $(addprefix --dex-file=,$(filter-out $(DEX2OAT),$^)) --oat=$@ --image=$(TARGET_BOOT_IMG) --base=$(IMG_TARGET_BASE_ADDRESS) --host-prefix=$(PRODUCT_OUT)
 
 $(TARGET_BOOT_IMG): $(TARGET_BOOT_OAT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := boot.art
+LOCAL_MODULE_TAGS := optional
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_BOOT_IMG)
+include $(BUILD_PHONY_PACKAGE)