Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bff3cb28 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove unused errorMessage" am: 78a488cd am: fd426e18 am: 2f5ce950 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06708ad8febc8df30eb7dcc657f2b791e97a03e2
parents 637ceb4e 2f5ce950

tools/bit/make.cpp

+2 −4
Original line number Diff line number Diff line
@@ -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;

    }