commit 3eb21e57ac7dd8ddcc2102cd0f71091d816d57cb
author Brian Carlstrom <bdc@google.com> Mon Dec 15 22:10:04 2014 -0800
committer Brian Carlstrom <bdc@google.com> Tue Dec 16 08:12:52 2014 -0800
tree e2a9bf9e381fe2deeb3ff34feb53d59adaa1f815
parent f610c0597e001cb1043aa4074afe25ae79a800e3

Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA

Bug: 18673991
Change-Id: I8be2f997005611b791755c8d7fa44974f1816d6b

Android.mk

diff --git a/Android.mk b/Android.mk
index d11d011..40f5f9a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -313,11 +313,7 @@
 
 # $(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 dalvik-cache-out,$(1)/classes.dex)
-else
 OUT_OAT_FILE := $(PRODUCT_OUT)/$(basename $(1)).odex
-endif
 
 ifeq ($(ONE_SHOT_MAKEFILE),)
 # ONE_SHOT_MAKEFILE is empty for a top level build and we don't want