diff options
author | Richard Uhler <ruhler@google.com> | 2015-03-16 14:32:16 -0700 |
---|---|---|
committer | Richard Uhler <ruhler@google.com> | 2015-03-25 14:44:44 -0700 |
commit | 6343411e52d2a59cd716cb47a85ebd0d68e61a3c (patch) | |
tree | 64f9be60771f0e40fcea0706ab14afffc95f9d3a /runtime/oat_file_assistant.h | |
parent | 19c1c124fb92a13c5f59dfde8f638b7bf9b73abb (diff) | |
download | art-6343411e52d2a59cd716cb47a85ebd0d68e61a3c.zip art-6343411e52d2a59cd716cb47a85ebd0d68e61a3c.tar.gz art-6343411e52d2a59cd716cb47a85ebd0d68e61a3c.tar.bz2 |
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
Diffstat (limited to 'runtime/oat_file_assistant.h')
-rw-r--r-- | runtime/oat_file_assistant.h | 11 |
1 files changed, 6 insertions, 5 deletions
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 @@ class OatFileAssistant { 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: |