diff options
| author | 2023-08-18 19:05:20 +0000 | |
|---|---|---|
| committer | 2023-08-18 19:05:20 +0000 | |
| commit | 0e91b7269483d6392203606b3a766807d175b4ba (patch) | |
| tree | 3e6115d21f56e650b4d5d27f360c5214df4a709d /tools/split-select/TestRules.cpp | |
| parent | 15a10db6b2dcc2d8405a12405dc26779b595497e (diff) | |
| parent | 64441287a544d12f14e526e8cffac5085ea1c1b5 (diff) | |
Merge "Use String8/16 c_str [tools]" into udc-dev-plus-aosp am: b370693c67 am: 64441287a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24484497
Change-Id: Ic55aa0d2e9130860c20029ad43799502cc17d1e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/split-select/TestRules.cpp')
| -rw-r--r-- | tools/split-select/TestRules.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/split-select/TestRules.cpp b/tools/split-select/TestRules.cpp index 86ccd6a25c18..ca3c56fe861c 100644 --- a/tools/split-select/TestRules.cpp +++ b/tools/split-select/TestRules.cpp @@ -78,9 +78,8 @@ const Rule AlwaysTrue() { const String8 actualStr(actual != NULL ? actual->toJson() : String8()); if (expectedStr != actualStr) { - return ::testing::AssertionFailure() - << "Expected: " << expectedStr.string() << "\n" - << " Actual: " << actualStr.string(); + return ::testing::AssertionFailure() << "Expected: " << expectedStr.c_str() << "\n" + << " Actual: " << actualStr.c_str(); } return ::testing::AssertionSuccess(); } |