commit e7173cee108fe82b0469c456f69fe5a4160d5192
author Richard Uhler <ruhler@google.com> Thu Mar 26 14:57:33 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 26 14:57:33 2015 +0000
tree 683877d540b9cf5c3c63ca0d999e6e3de6cdac5e
parent a45223b63566d8496250ae797778a4d16ee81419
parent 820fe32d467b7b8b25ef1645eec8876492619f75

Merge "Store odex files in oat/<isa>/ directory."

core/dex_preopt_libart.mk

diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index bee5d40..fb62e0c 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -62,7 +62,7 @@
 # $(1): the arch name.
 # $(2): the full path (including file name) of the corresponding .jar or .apk.
 define get-odex-file-path
-$(dir $(2))$(1)/$(basename $(notdir $(2))).odex
+$(dir $(2))oat/$(1)/$(basename $(notdir $(2))).odex
 endef
 
 # Returns the path to the image file (such as "/system/framework/<arch>/boot.art"