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/build and
platform/frameworks/native.
Bug: 19550105
Change-Id: I4c6be4f0c41ff175904846db8e360c4af815b265
diff --git a/runtime/oat_file_assistant.h b/runtime/oat_file_assistant.h
index 958b440..f2abcf9 100644
--- a/runtime/oat_file_assistant.h
+++ b/runtime/oat_file_assistant.h
@@ -151,11 +151,12 @@
static std::vector<std::unique_ptr<const DexFile>> LoadDexFiles(
const OatFile& oat_file, const char* dex_location);
- // If the dex file has been pre-compiled on the host, the compiled oat file
- // will have the extension .odex, and is referred to as the odex file.
- // It is called odex for legacy reasons; the file is really an oat file. The
- // odex file will typically have a patch delta of 0 and need to be relocated
- // before use for the purposes of ASLR.
+ // If the dex file has been installed with a compiled oat file alongside
+ // it, the compiled oat file will have the extension .odex, and is referred
+ // to as the odex file. It is called odex for legacy reasons; the file is
+ // really an oat file. The odex file will often, but not always, have a
+ // patch delta of 0 and need to be relocated before use for the purposes of
+ // ASLR. The odex file is treated as if it were read-only.
// These methods return the location and status of the odex file for the dex
// location.
// Notes: