From 820fe32d467b7b8b25ef1645eec8876492619f75 Mon Sep 17 00:00:00 2001
From: Richard Uhler <ruhler@google.com>
Date: Mon, 16 Mar 2015 14:38:17 -0700
Subject: [PATCH] Store odex files in oat/<isa>/ directory.

Previously odex files were stored alongside the dex location as:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/<isa>/base.odex

This changes where odex files are stored, adding an "oat" directory:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/oat/<isa>/base.odex

See also the corresponding change in platform/art and
platform/frameworks/native.

Bug: 19550105
Change-Id: I4c6be4f0c41ff175904846db8e360c4af815b265
---
 core/dex_preopt_libart.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index bee5d40cc..fb62e0c6c 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -62,7 +62,7 @@ endif
 # $(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"