diff options
| author | Vladimir Marko <vmarko@google.com> | 2016-01-27 18:33:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-27 18:33:38 +0000 |
| commit | ca5050538cbb0260c50530055f1ea880015327b7 (patch) | |
| tree | 20520a5b5838b3251fd755584645d8ae85908b17 /compiler/driver/compiler_options.cc | |
| parent | 1be9e27239dc63bb4d8134df50be60f65a9d5da3 (diff) | |
| parent | 47496c293b2b79c9747eeebafe444715202e7fc6 (diff) | |
Merge "ART: Allow --no-inline-from to specify multiple dex files."
Diffstat (limited to 'compiler/driver/compiler_options.cc')
| -rw-r--r-- | compiler/driver/compiler_options.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/driver/compiler_options.cc b/compiler/driver/compiler_options.cc index e0b1d8b2b2..9285b8c927 100644 --- a/compiler/driver/compiler_options.cc +++ b/compiler/driver/compiler_options.cc @@ -63,7 +63,7 @@ CompilerOptions::CompilerOptions(CompilerFilter compiler_filter, size_t num_dex_methods_threshold, size_t inline_depth_limit, size_t inline_max_code_units, - const DexFile* no_inline_from, + const std::vector<const DexFile*>* no_inline_from, bool include_patch_information, double top_k_profile_threshold, bool debuggable, |