diff options
| author | Kenny Root <kroot@google.com> | 2014-05-13 22:03:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-13 22:03:05 +0000 |
| commit | 20cdc069f06f34828e51bcf89597bebe5df445d5 (patch) | |
| tree | 916f48e3aa5c688fb5b0642f4a6963f595b64a93 /dex2oat | |
| parent | b720c4b7c6e484c9d0740d805c8d7c3dbeb2a545 (diff) | |
| parent | d5185344e19d9feb7ac268369e0af6a467d1cb48 (diff) | |
| download | art-20cdc069f06f34828e51bcf89597bebe5df445d5.zip art-20cdc069f06f34828e51bcf89597bebe5df445d5.tar.gz art-20cdc069f06f34828e51bcf89597bebe5df445d5.tar.bz2 | |
Merge "Changes for vogar compatibility"
Diffstat (limited to 'dex2oat')
| -rw-r--r-- | dex2oat/dex2oat.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index cea86ae..3c1889d 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -1139,21 +1139,23 @@ static int dex2oat(int argc, char** argv) { WellKnownClasses::Init(self->GetJniEnv()); // If --image-classes was specified, calculate the full list of classes to include in the image - UniquePtr<CompilerDriver::DescriptorSet> image_classes(NULL); - if (image_classes_filename != NULL) { + UniquePtr<CompilerDriver::DescriptorSet> image_classes(nullptr); + if (image_classes_filename != nullptr) { std::string error_msg; - if (image_classes_zip_filename != NULL) { + if (image_classes_zip_filename != nullptr) { image_classes.reset(dex2oat->ReadImageClassesFromZip(image_classes_zip_filename, image_classes_filename, &error_msg)); } else { image_classes.reset(dex2oat->ReadImageClassesFromFile(image_classes_filename)); } - if (image_classes.get() == NULL) { + if (image_classes.get() == nullptr) { LOG(ERROR) << "Failed to create list of image classes from '" << image_classes_filename << "': " << error_msg; return EXIT_FAILURE; } + } else if (image) { + image_classes.reset(new CompilerDriver::DescriptorSet); } std::vector<const DexFile*> dex_files; |