diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-11-11 02:55:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-11 02:55:12 +0000 |
| commit | 6ba4c9d91bfcd2acf3ad85db0a7945438ab4548c (patch) | |
| tree | 65ab2d0accac64e3bb81484d66640d849ca78c26 /tools/split-select/TestRules.cpp | |
| parent | 8108bf6a974b929ee42170f5eadd0e3a2751c3c2 (diff) | |
| parent | c78b33d01187336d960457980acb05cac86241be (diff) | |
am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a7
* commit 'c78b33d01187336d960457980acb05cac86241be':
split-select: fix OSX build
Diffstat (limited to 'tools/split-select/TestRules.cpp')
| -rw-r--r-- | tools/split-select/TestRules.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/split-select/TestRules.cpp b/tools/split-select/TestRules.cpp index f980dc4c9416..86ccd6a25c18 100644 --- a/tools/split-select/TestRules.cpp +++ b/tools/split-select/TestRules.cpp @@ -75,7 +75,7 @@ const Rule AlwaysTrue() { const char*, const char*, const sp<Rule>& actual, const Rule& expected) { const String8 expectedStr(expected.toJson()); - const String8 actualStr(actual != NULL ? actual->toJson() : ""); + const String8 actualStr(actual != NULL ? actual->toJson() : String8()); if (expectedStr != actualStr) { return ::testing::AssertionFailure() |