diff options
| author | 2015-07-29 18:00:56 +0000 | |
|---|---|---|
| committer | 2015-07-29 18:00:56 +0000 | |
| commit | 57a9c7d3bb01a82767a537a07aa2d6f99f958d15 (patch) | |
| tree | 99bba9316b4ed09a170845e67706c25cc5cb8bf8 | |
| parent | b9318481111eafd0794fded1a46a5f20ffcfa7cb (diff) | |
| parent | 0941b9d48a9a8c6d80a1af7a0d0fc9f80fe2b9a1 (diff) | |
Merge "Fix gtests."
| -rw-r--r-- | compiler/dex/quick/quick_cfi_test.cc | 2 | ||||
| -rw-r--r-- | compiler/dex/quick/x86/quick_assemble_x86_test.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/compiler/dex/quick/quick_cfi_test.cc b/compiler/dex/quick/quick_cfi_test.cc index dd68dd40c6..8318b526b6 100644 --- a/compiler/dex/quick/quick_cfi_test.cc +++ b/compiler/dex/quick/quick_cfi_test.cc @@ -56,6 +56,8 @@ class QuickCFITest : public CFITest { CompilerOptions::kDefaultSmallMethodThreshold, CompilerOptions::kDefaultTinyMethodThreshold, CompilerOptions::kDefaultNumDexMethodsThreshold, + CompilerOptions::kDefaultInlineDepthLimit, + CompilerOptions::kDefaultInlineMaxCodeUnits, false, CompilerOptions::kDefaultTopKProfileThreshold, false, diff --git a/compiler/dex/quick/x86/quick_assemble_x86_test.cc b/compiler/dex/quick/x86/quick_assemble_x86_test.cc index 798e23fbac..98e9f38d52 100644 --- a/compiler/dex/quick/x86/quick_assemble_x86_test.cc +++ b/compiler/dex/quick/x86/quick_assemble_x86_test.cc @@ -39,6 +39,8 @@ class QuickAssembleX86TestBase : public testing::Test { CompilerOptions::kDefaultSmallMethodThreshold, CompilerOptions::kDefaultTinyMethodThreshold, CompilerOptions::kDefaultNumDexMethodsThreshold, + CompilerOptions::kDefaultInlineDepthLimit, + CompilerOptions::kDefaultInlineMaxCodeUnits, false, CompilerOptions::kDefaultTopKProfileThreshold, false, |