| commit | d9a9d44ae018826a380b62cdc09d536f8ce30208 | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Mon Jan 16 14:45:28 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jan 16 14:45:29 2017 +0000 |
| tree | 7fbeeb927f662207c4682d1d32ddf219e09d49ca | |
| parent | a11ad8a46d6b3f1b676e77189e39347d9665349f [diff] | |
| parent | fea84ddbccae1c1242d6a1815f6580d758bae8c7 [diff] |
Merge "ART: Fix artInvokePolymorphic."
diff --git a/runtime/arch/mips64/instruction_set_features_mips64.cc b/runtime/arch/mips64/instruction_set_features_mips64.cc index 5606c1d..5757906 100644 --- a/runtime/arch/mips64/instruction_set_features_mips64.cc +++ b/runtime/arch/mips64/instruction_set_features_mips64.cc
@@ -70,7 +70,7 @@ } std::string Mips64InstructionSetFeatures::GetFeatureString() const { - return ""; + return "default"; } std::unique_ptr<const InstructionSetFeatures>
diff --git a/runtime/arch/mips64/instruction_set_features_mips64_test.cc b/runtime/arch/mips64/instruction_set_features_mips64_test.cc index 1d03794..380c4e5 100644 --- a/runtime/arch/mips64/instruction_set_features_mips64_test.cc +++ b/runtime/arch/mips64/instruction_set_features_mips64_test.cc
@@ -27,7 +27,7 @@ ASSERT_TRUE(mips64_features.get() != nullptr) << error_msg; EXPECT_EQ(mips64_features->GetInstructionSet(), kMips64); EXPECT_TRUE(mips64_features->Equals(mips64_features.get())); - EXPECT_STREQ("", mips64_features->GetFeatureString().c_str()); + EXPECT_STREQ("default", mips64_features->GetFeatureString().c_str()); EXPECT_EQ(mips64_features->AsBitmap(), 0U); }