diff options
| author | 2021-03-04 07:19:44 +0000 | |
|---|---|---|
| committer | 2021-03-04 07:19:44 +0000 | |
| commit | 2f5ce950577f7bc98f1c6e24302650749331e6a3 (patch) | |
| tree | 7af6c8ea13f5ca3afa050b972f1340369f13334d /tools/bit/make.cpp | |
| parent | dfe17d4e6854cacc393ad9944169e78a7d5f5bad (diff) | |
| parent | fd426e18cd9b73cab61df040d011922be9886fca (diff) | |
Merge "Remove unused errorMessage" am: 78a488cd10 am: fd426e18cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616687
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb0d9947c75984e31b21820359de19b8526c72fd
Diffstat (limited to 'tools/bit/make.cpp')
| -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; } |