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

Commit 7a58f264 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 am: bff3cb28 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f8ffc953064a72c1efd31c9c7b885b6f6b2ec77
parents 92d7a9e4 bff3cb28

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;

    }