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/gc | |
| parent | ce70082da8a4e63c280c2f049a67b38acc82ee1a (diff) | |
| download | art-094ff2c0c1f736521c634d5f606e274cb6c55345.zip art-094ff2c0c1f736521c634d5f606e274cb6c55345.tar.gz art-094ff2c0c1f736521c634d5f606e274cb6c55345.tar.bz2 | |
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/gc')
| -rw-r--r-- | runtime/gc/space/image_space.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc index f350038..99f5d45 100644 --- a/runtime/gc/space/image_space.cc +++ b/runtime/gc/space/image_space.cc @@ -203,6 +203,9 @@ static bool GenerateImage(const std::string& image_filename, InstructionSet imag oat_file_option_string += ImageHeader::GetOatLocationFromImageLocation(image_filename); arg_vector.push_back(oat_file_option_string); + // Note: we do not generate a fully debuggable boot image so we do not pass the + // compiler flag --debuggable here. + Runtime::Current()->AddCurrentRuntimeFeaturesAsDex2OatArguments(&arg_vector); CHECK_EQ(image_isa, kRuntimeISA) << "We should always be generating an image for the current isa."; |