diff options
| author | 2015-12-24 11:55:50 +0000 | |
|---|---|---|
| committer | 2015-12-24 11:55:50 +0000 | |
| commit | fed399c39a89a04966cf9c7da300c8a1d6404453 (patch) | |
| tree | b1c6399751c98babd3839bd4d5ff4a1f6a5c274c /compiler/optimizing/optimizing_compiler.cc | |
| parent | 58b2329de74a73d2f0a7ed001e50cc39df33d9da (diff) | |
| parent | 7f65b4669c52976cd5713dae47b901707ed77110 (diff) | |
Merge internal master into aosp/master.
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 831b626c4f..dd1d193ca3 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -880,7 +880,11 @@ Compiler* CreateOptimizingCompiler(CompilerDriver* driver) { bool IsCompilingWithCoreImage() { const std::string& image = Runtime::Current()->GetImageLocation(); - return EndsWith(image, "core.art") || EndsWith(image, "core-optimizing.art"); + // TODO: This is under-approximating... + if (EndsWith(image, "core.art") || EndsWith(image, "core-optimizing.art")) { + return true; + } + return false; } bool OptimizingCompiler::JitCompile(Thread* self, |