From 47496c293b2b79c9747eeebafe444715202e7fc6 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 27 Jan 2016 16:15:08 +0000 Subject: 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.dex files. Change-Id: I74da4839bf9bb405dd62ad80563bf646a7a65dd9 --- compiler/driver/compiler_options.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/driver/compiler_options.cc') 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* no_inline_from, bool include_patch_information, double top_k_profile_threshold, bool debuggable, -- cgit v1.2.3-59-g8ed1b