diff options
| author | 2023-08-18 22:16:38 +0000 | |
|---|---|---|
| committer | 2023-08-18 22:16:38 +0000 | |
| commit | 5da3bffd8df4a8fc8dee4a76dd25bba867bdf6a2 (patch) | |
| tree | 120581edcff183c54b699da80285d5f45d32a473 /tools/split-select/TestRules.cpp | |
| parent | fd825692c87f33505ee4b00e7c0b850b3ec1591c (diff) | |
| parent | e1ee1aab9f99d05ca97dee3701afb894a6129446 (diff) | |
Merge "Use String8/16 c_str [tools]" into main am: e1ee1aab9f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2715262
Change-Id: Id96698af270e502eed312f6ce0adb3d8ac94f2ff
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(); } |