diff options
| author | 2016-04-13 11:03:46 -0700 | |
|---|---|---|
| committer | 2016-05-03 12:22:39 -0700 | |
| commit | f4b3487ee77e3c2e3d5372ae9e857cd3429bb808 (patch) | |
| tree | b48ab16dec4e8d1deab6556788f9a5fe2b62f77a /compiler | |
| parent | a6513729ae2ad0d2f9dd21d77ea6cf9ed9fa6eef (diff) | |
Remove -XOatFileManagerCompilerFilter argument.
Instead use the value of '-Xcompiler-option --compiler-filter=XXX' for
the target compiler filter to use to determine if the runtime should
try to invoke dex2oat when oat files are loaded.
Bug: 27641809
Change-Id: I1856e0e37df91835b81105567c70d8a285a88f62
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/driver/compiler_options.cc | 2 | ||||
| -rw-r--r-- | compiler/driver/compiler_options.h | 1 | ||||
| -rw-r--r-- | compiler/jit/jit_compiler.cc | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/compiler/driver/compiler_options.cc b/compiler/driver/compiler_options.cc index 1bd4c3ad80..f20dba34a6 100644 --- a/compiler/driver/compiler_options.cc +++ b/compiler/driver/compiler_options.cc @@ -21,7 +21,7 @@ namespace art { CompilerOptions::CompilerOptions() - : compiler_filter_(kDefaultCompilerFilter), + : compiler_filter_(CompilerFilter::kDefaultCompilerFilter), huge_method_threshold_(kDefaultHugeMethodThreshold), large_method_threshold_(kDefaultLargeMethodThreshold), small_method_threshold_(kDefaultSmallMethodThreshold), diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h index c67ab6ef14..6bbd3c5a19 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -31,7 +31,6 @@ namespace art { class CompilerOptions FINAL { public: // Guide heuristics to determine whether to compile method if profile data not available. - static const CompilerFilter::Filter kDefaultCompilerFilter = CompilerFilter::kSpeed; static const size_t kDefaultHugeMethodThreshold = 10000; static const size_t kDefaultLargeMethodThreshold = 600; static const size_t kDefaultSmallMethodThreshold = 60; diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc index c2d7ff7795..178533849b 100644 --- a/compiler/jit/jit_compiler.cc +++ b/compiler/jit/jit_compiler.cc @@ -88,7 +88,7 @@ NO_RETURN static void Usage(const char* fmt, ...) { JitCompiler::JitCompiler() { compiler_options_.reset(new CompilerOptions( - CompilerOptions::kDefaultCompilerFilter, + CompilerFilter::kDefaultCompilerFilter, CompilerOptions::kDefaultHugeMethodThreshold, CompilerOptions::kDefaultLargeMethodThreshold, CompilerOptions::kDefaultSmallMethodThreshold, |