commit bff3cb288cfa25a8946ea5b317ad3a3842d10f2b
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 04 08:03:50 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 04 08:03:50 2021 +0000
tree 88abb7dcab17dd3ccad8819dab3820aa5b437a34
parent 637ceb4e6a18c6e25eb135ed0727cb5da859e8df
parent 2f5ce950577f7bc98f1c6e24302650749331e6a3

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

tools/bit/make.cpp

diff --git a/tools/bit/make.cpp b/tools/bit/make.cpp
index c39f494..2a88732 100644
--- a/tools/bit/make.cpp
+++ b/tools/bit/make.cpp
@@ -90,8 +90,7 @@
 
     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 @@
 
     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;
     }