diff options
| author | 2017-08-11 10:26:39 +0000 | |
|---|---|---|
| committer | 2017-08-11 10:26:39 +0000 | |
| commit | 54636c0e85ad1bcd5798324c0484122364e99298 (patch) | |
| tree | 6ec47505bdb6dd232cf43b86eb9d2c438d2f052f /compiler/optimizing/optimizing_compiler.cc | |
| parent | abafaf83838301b83832c33324d683e7f77aff76 (diff) | |
| parent | 2b03a1f24600c8c9558fb13d3f8bca1ef0f8ee40 (diff) | |
Merge "Instrument ARM64 generated code to check the Marking Register."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 51101f104a..a6c33b461d 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -22,8 +22,6 @@ #include <stdint.h> -#include "android-base/strings.h" - #ifdef ART_ENABLE_CODEGEN_arm64 #include "instruction_simplifier_arm64.h" #endif @@ -1111,12 +1109,7 @@ Compiler* CreateOptimizingCompiler(CompilerDriver* driver) { bool IsCompilingWithCoreImage() { const std::string& image = Runtime::Current()->GetImageLocation(); - // TODO: This is under-approximating... - if (android::base::EndsWith(image, "core.art") || - android::base::EndsWith(image, "core-optimizing.art")) { - return true; - } - return false; + return CompilerDriver::IsCoreImageFilename(image); } bool EncodeArtMethodInInlineInfo(ArtMethod* method ATTRIBUTE_UNUSED) { |