Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused errorMessage"

Browse Source
This commit is contained in:
Treehugger Robot
2021-03-04 06:03:56 +00:00
committed by Gerrit Code Review
parent 12acf15141 1c9baa3191
commit 78a488cd10
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/bit/make.cpp
View File

@@ -90,8 +90,7 @@ BuildVars::BuildVars(const string& outDir, const string& buildProduct,
Json::Value json; Json::Value json;
Json::CharReaderBuilder builder; Json::CharReaderBuilder builder;
std::string errorMessage; if (!Json::parseFromStream(builder, stream, &json, /* errorMessage = */ nullptr)) {
if (!Json::parseFromStream(builder, stream, &json, &errorMessage)) {
return; return;
} }
@@ -215,8 +214,7 @@ read_modules(const string& buildOut, const string& device, map<string,Module>* r
Json::Value json; Json::Value json;
Json::CharReaderBuilder builder; Json::CharReaderBuilder builder;
std::string errorMessage; if (!Json::parseFromStream(builder, stream, &json, /* errorMessage = */ nullptr)) {
if (!Json::parseFromStream(builder, stream, &json, &errorMessage)) {
json_error(filename, "can't parse json format", quiet); json_error(filename, "can't parse json format", quiet);
return; return;
} }