diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-04 08:03:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-04 08:03:50 +0000 |
| commit | bff3cb288cfa25a8946ea5b317ad3a3842d10f2b (patch) | |
| tree | 88abb7dcab17dd3ccad8819dab3820aa5b437a34 | |
| parent | 637ceb4e6a18c6e25eb135ed0727cb5da859e8df (diff) | |
| parent | 2f5ce950577f7bc98f1c6e24302650749331e6a3 (diff) | |
Merge "Remove unused errorMessage" am: 78a488cd10 am: fd426e18cd am: 2f5ce95057
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616687
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06708ad8febc8df30eb7dcc657f2b791e97a03e2
| -rw-r--r-- | tools/bit/make.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/bit/make.cpp b/tools/bit/make.cpp index c39f49465054..2a88732b50b1 100644 --- a/tools/bit/make.cpp +++ b/tools/bit/make.cpp @@ -90,8 +90,7 @@ BuildVars::BuildVars(const string& outDir, const string& buildProduct, Json::Value json; Json::CharReaderBuilder builder; - std::string errorMessage; - if (!Json::parseFromStream(builder, stream, &json, &errorMessage)) { + if (!Json::parseFromStream(builder, stream, &json, /* errorMessage = */ nullptr)) { return; } @@ -215,8 +214,7 @@ read_modules(const string& buildOut, const string& device, map<string,Module>* r Json::Value json; Json::CharReaderBuilder builder; - std::string errorMessage; - if (!Json::parseFromStream(builder, stream, &json, &errorMessage)) { + if (!Json::parseFromStream(builder, stream, &json, /* errorMessage = */ nullptr)) { json_error(filename, "can't parse json format", quiet); return; } |