commit 46b8a62388f6ac5209371515e48915c32e6d62b9
author Brian Carlstrom <bdc@google.com> Tue Jun 19 23:13:22 2012 -0700
committer Brian Carlstrom <bdc@google.com> Mon Jun 25 10:32:02 2012 -0700
tree 4df6cb385addbc71bea7cbf8ce55bb27febb7da6
parent 4e181288cc6bd67baa1024e2fdb7201dde3d100e

Compare checksum in oat files adjacent to jar/apk to support oat in system image

Change-Id: I45554c9fa5c369a0f47830623b6dbe7f9c691a08

Android.mk

diff --git a/Android.mk b/Android.mk
index 9c422b9..14a7679 100644
--- a/Android.mk
+++ b/Android.mk
@@ -233,7 +233,11 @@
 
 # $(1): input jar or apk target location
 define declare-oat-target-target
+ifneq (,$(filter $(1),$(addprefix system/app/,$(addsuffix .apk,$(PRODUCT_DEX_PREOPT_PACKAGES_IN_DATA)))))
 OUT_OAT_FILE := $(call art-cache-out,$(1).oat)
+else
+OUT_OAT_FILE := $(PRODUCT_OUT)/$(1).oat
+endif
 
 ifeq ($(ONE_SHOT_MAKEFILE),)
 .PHONY: oat-target-$(1)
@@ -254,7 +258,7 @@
 
 $(foreach file,\
   $(filter-out\
-    $(TARGET_BOOT_DEX),\
+    $(addprefix $(TARGET_OUT_JAVA_LIBRARIES)/,$(addsuffix .jar,$(TARGET_BOOT_JARS))),\
     $(wildcard $(TARGET_OUT_APPS)/*.apk) $(wildcard $(TARGET_OUT_JAVA_LIBRARIES)/*.jar)),\
   $(eval $(call declare-oat-target-target,$(subst $(PRODUCT_OUT)/,,$(file)))))