diff options
Diffstat (limited to 'runtime/oat_file_assistant.cc')
| -rw-r--r-- | runtime/oat_file_assistant.cc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc index 3d7bf3f532..1b0f0bc7e9 100644 --- a/runtime/oat_file_assistant.cc +++ b/runtime/oat_file_assistant.cc @@ -44,7 +44,6 @@ #include "dex/art_dex_file_loader.h" #include "dex/dex_file_loader.h" #include "exec_utils.h" -#include "fmt/format.h" #include "gc/heap.h" #include "gc/space/image_space.h" #include "image.h" @@ -60,8 +59,6 @@ namespace art { using ::android::base::ConsumePrefix; using ::android::base::StringPrintf; -using ::fmt::literals::operator""_format; // NOLINT - static constexpr const char* kAnonymousDexPrefix = "Anonymous-DexFile@"; static constexpr const char* kVdexExtension = ".vdex"; static constexpr const char* kDmExtension = ".dm"; @@ -884,15 +881,15 @@ OatFileAssistant::OatFileInfo& OatFileAssistant::GetBestInfo() { // If the odex is not useable, and we have a useable vdex, return the vdex // instead. - VLOG(oat) << "GetBestInfo checking odex next to the dex file ({})"_format( - odex_.DisplayFilename()); + VLOG(oat) << ART_FORMAT("GetBestInfo checking odex next to the dex file ({})", + odex_.DisplayFilename()); if (!odex_.IsUseable()) { - VLOG(oat) << "GetBestInfo checking vdex next to the dex file ({})"_format( - vdex_for_odex_.DisplayFilename()); + VLOG(oat) << ART_FORMAT("GetBestInfo checking vdex next to the dex file ({})", + vdex_for_odex_.DisplayFilename()); if (vdex_for_odex_.IsUseable()) { return vdex_for_odex_; } - VLOG(oat) << "GetBestInfo checking dm ({})"_format(dm_for_odex_.DisplayFilename()); + VLOG(oat) << ART_FORMAT("GetBestInfo checking dm ({})", dm_for_odex_.DisplayFilename()); if (dm_for_odex_.IsUseable()) { return dm_for_odex_; } @@ -903,7 +900,7 @@ OatFileAssistant::OatFileInfo& OatFileAssistant::GetBestInfo() { // We cannot write to the odex location. This must be a system app. // If the oat location is useable take it. - VLOG(oat) << "GetBestInfo checking odex in dalvik-cache ({})"_format(oat_.DisplayFilename()); + VLOG(oat) << ART_FORMAT("GetBestInfo checking odex in dalvik-cache ({})", oat_.DisplayFilename()); if (oat_.IsUseable()) { return oat_; } @@ -911,29 +908,29 @@ OatFileAssistant::OatFileInfo& OatFileAssistant::GetBestInfo() { // The oat file is not useable but the odex file might be up to date. // This is an indication that we are dealing with an up to date prebuilt // (that doesn't need relocation). - VLOG(oat) << "GetBestInfo checking odex next to the dex file ({})"_format( - odex_.DisplayFilename()); + VLOG(oat) << ART_FORMAT("GetBestInfo checking odex next to the dex file ({})", + odex_.DisplayFilename()); if (odex_.IsUseable()) { return odex_; } // Look for a useable vdex file. - VLOG(oat) << "GetBestInfo checking vdex in dalvik-cache ({})"_format( - vdex_for_oat_.DisplayFilename()); + VLOG(oat) << ART_FORMAT("GetBestInfo checking vdex in dalvik-cache ({})", + vdex_for_oat_.DisplayFilename()); if (vdex_for_oat_.IsUseable()) { return vdex_for_oat_; } - VLOG(oat) << "GetBestInfo checking vdex next to the dex file ({})"_format( - vdex_for_odex_.DisplayFilename()); + VLOG(oat) << ART_FORMAT("GetBestInfo checking vdex next to the dex file ({})", + vdex_for_odex_.DisplayFilename()); if (vdex_for_odex_.IsUseable()) { return vdex_for_odex_; } - VLOG(oat) << "GetBestInfo checking dm ({})"_format(dm_for_oat_.DisplayFilename()); + VLOG(oat) << ART_FORMAT("GetBestInfo checking dm ({})", dm_for_oat_.DisplayFilename()); if (dm_for_oat_.IsUseable()) { return dm_for_oat_; } // TODO(jiakaiz): Is this the same as above? - VLOG(oat) << "GetBestInfo checking dm ({})"_format(dm_for_odex_.DisplayFilename()); + VLOG(oat) << ART_FORMAT("GetBestInfo checking dm ({})", dm_for_odex_.DisplayFilename()); if (dm_for_odex_.IsUseable()) { return dm_for_odex_; } @@ -1154,18 +1151,21 @@ bool OatFileAssistant::OatFileInfo::ShouldRecompileForFilter(CompilerFilter::Fil CompilerFilter::Filter current = file->GetCompilerFilter(); if (dexopt_trigger.targetFilterIsBetter && CompilerFilter::IsBetter(target, current)) { - VLOG(oat) << "Should recompile: targetFilterIsBetter (current: {}, target: {})"_format( - CompilerFilter::NameOfFilter(current), CompilerFilter::NameOfFilter(target)); + VLOG(oat) << ART_FORMAT("Should recompile: targetFilterIsBetter (current: {}, target: {})", + CompilerFilter::NameOfFilter(current), + CompilerFilter::NameOfFilter(target)); return true; } if (dexopt_trigger.targetFilterIsSame && current == target) { - VLOG(oat) << "Should recompile: targetFilterIsSame (current: {}, target: {})"_format( - CompilerFilter::NameOfFilter(current), CompilerFilter::NameOfFilter(target)); + VLOG(oat) << ART_FORMAT("Should recompile: targetFilterIsSame (current: {}, target: {})", + CompilerFilter::NameOfFilter(current), + CompilerFilter::NameOfFilter(target)); return true; } if (dexopt_trigger.targetFilterIsWorse && CompilerFilter::IsBetter(current, target)) { - VLOG(oat) << "Should recompile: targetFilterIsWorse (current: {}, target: {})"_format( - CompilerFilter::NameOfFilter(current), CompilerFilter::NameOfFilter(target)); + VLOG(oat) << ART_FORMAT("Should recompile: targetFilterIsWorse (current: {}, target: {})", + CompilerFilter::NameOfFilter(current), + CompilerFilter::NameOfFilter(target)); return true; } |