commit c155b05481e5995a0aa1d8edaa5047bbdb631c6e
author Jeff Hao <jeffhao@google.com> Tue Jan 17 17:43:29 2017 -0800
committer Jeff Hao <jeffhao@google.com> Fri Jan 20 16:23:40 2017 -0800
tree 1263bb5d2ccc1b893ae0bfe24f884bde6818065f
parent d713d29507fb98bea3eee9277f05422a9b641ca1

Merge layout-speed compiler filter into speed-profile.

Bug: 29921113
Test: mm test-art-host
Change-Id: I2a22cbec7172f05e61b5e6d3d5dfc09026f92ec3

dex2oat/dex2oat_test.cc

diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc
index e86e560..8933dd0 100644
--- a/dex2oat/dex2oat_test.cc
+++ b/dex2oat/dex2oat_test.cc
@@ -591,7 +591,7 @@
     GenerateProfile(profile_location, dex_location, dex_file->GetLocationChecksum());
 
     const std::vector<std::string>& extra_args = { "--profile-file=" + profile_location };
-    GenerateOdexForTest(dex_location, odex_location, CompilerFilter::kLayoutProfile, extra_args);
+    GenerateOdexForTest(dex_location, odex_location, CompilerFilter::kSpeedProfile, extra_args);
 
     CheckValidity();
     ASSERT_TRUE(success_);
@@ -632,7 +632,7 @@
       EXPECT_EQ(old_class1, new_class0);
     }
 
-    EXPECT_EQ(odex_file->GetCompilerFilter(), CompilerFilter::kLayoutProfile);
+    EXPECT_EQ(odex_file->GetCompilerFilter(), CompilerFilter::kSpeedProfile);
   }
 
     // Check whether the dex2oat run was really successful.