diff options
| author | 2021-03-04 06:29:43 +0000 | |
|---|---|---|
| committer | 2021-03-04 06:29:43 +0000 | |
| commit | fd426e18cd9b73cab61df040d011922be9886fca (patch) | |
| tree | 351ff397bee81d5a0d5137ff8d648eaabe5adebd /tools/bit/make.cpp | |
| parent | 8397f20aff138221089f671ea83021aafc7f9bd8 (diff) | |
| parent | 78a488cd10a99aa7d2a3323ad9a0e36eee7337a5 (diff) | |
Merge "Remove unused errorMessage" am: 78a488cd10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616687
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c9d4dd0c721c1bb0340e52f4af1c6813efa4ee7
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; } |