diff options
| author | Vladimir Marko <vmarko@google.com> | 2016-01-27 16:15:08 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2016-01-27 18:23:01 +0000 |
| commit | 47496c293b2b79c9747eeebafe444715202e7fc6 (patch) | |
| tree | 803ae4a82452031db43e219b687864241e6e66d3 /compiler/driver/compiler_options.cc | |
| parent | f032f3afe513093c508434b17ff1921a114c4424 (diff) | |
ART: Allow --no-inline-from to specify multiple dex files.
This will allow tests to specify arbitrary dex files from
which we should not inline, in addition to core-oj, so that
we can test the related functionality. Additionally, should
the core-oj.jar core grow beyond a single classes.dex and
require a multi-dex .jar, this change makes sure that we
prevent inlining also from the extra classes<N>.dex files.
Change-Id: I74da4839bf9bb405dd62ad80563bf646a7a65dd9
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 2644528e56..4f6e922665 100644 --- a/compiler/driver/compiler_options.cc +++ b/compiler/driver/compiler_options.cc @@ -62,7 +62,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, |