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

Merge "Remove unused errorMessage" am: 78a488cd10 am: fd426e18cd am: 2f5ce95057

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06708ad8febc8df30eb7dcc657f2b791e97a03e2
This commit is contained in:
Treehugger Robot
2021-03-04 08:03:50 +00:00
committed by Automerger Merge Worker
parent 637ceb4e6a 2f5ce95057
commit bff3cb288c
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::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;
}