diff options
| author | Sebastien Hertz <shertz@google.com> | 2015-05-13 12:14:05 +0200 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2015-05-19 19:39:18 +0200 |
| commit | 094ff2c0c1f736521c634d5f606e274cb6c55345 (patch) | |
| tree | 9e126be21844e24645120e84e511cbe8f9c33091 /runtime/oat_file.h | |
| parent | ce70082da8a4e63c280c2f049a67b38acc82ee1a (diff) | |
| download | art-094ff2c0c1f736521c634d5f606e274cb6c55345.tar.gz art-094ff2c0c1f736521c634d5f606e274cb6c55345.tar.bz2 art-094ff2c0c1f736521c634d5f606e274cb6c55345.zip | |
Fix debuggable compiler flag detection for secondary dex files
Compiles secondary dex files like the primary dex file: if it has
been compiled with the --debuggable flag, compile secondary dex files
with the --debuggable flag too.
Therefore, dex files loaded at runtime are compiled the same way as
dex files compiled at install time on the classpath (excluding the
boot image that is not compiled debuggable).
Also adds debuggable key in the oat header and bump the oat version.
Bug: 20944228
(cherry picked from commit 0de1133ba600f299b3d67938f650720d9f859eb2)
Change-Id: If6b2236e7fe547cc421f57b573043748018d3ae0
Diffstat (limited to 'runtime/oat_file.h')
| -rw-r--r-- | runtime/oat_file.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/oat_file.h b/runtime/oat_file.h index b32dd22490..12e9f6cea7 100644 --- a/runtime/oat_file.h +++ b/runtime/oat_file.h @@ -81,6 +81,9 @@ class OatFile FINAL { bool IsPic() const; + // Indicates whether the oat file was compiled with full debugging capability. + bool IsDebuggable() const; + ElfFile* GetElfFile() const { CHECK_NE(reinterpret_cast<uintptr_t>(elf_file_.get()), reinterpret_cast<uintptr_t>(nullptr)) << "Cannot get an elf file from " << GetLocation(); |