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

Merge "[bit] Use new jsoncpp API"

Browse Source
This commit is contained in:
Haibo Huang
2021-03-03 22:34:58 +00:00
committed by Gerrit Code Review
parent bb57bf925a 39f4db5ea0
commit c8379556c0
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/bit/make.cpp
View File

@@ -89,8 +89,9 @@ BuildVars::BuildVars(const string& outDir, const string& buildProduct,
} }
Json::Value json; Json::Value json;
Json::Reader reader; Json::CharReaderBuilder builder;
if (!reader.parse(stream, json)) { std::string errorMessage;
if (!Json::parseFromStream(builder, stream, &json, &errorMessage)) {
return; return;
} }
@@ -132,8 +133,9 @@ BuildVars::save()
return; return;
} }
Json::StyledStreamWriter writer(" "); Json::StreamWriterBuilder factory;
factory["indentation"] = " ";
std::unique_ptr<Json::StreamWriter> const writer(factory.newStreamWriter());
Json::Value json(Json::objectValue); Json::Value json(Json::objectValue);
for (map<string,string>::const_iterator it = m_cache.begin(); it != m_cache.end(); it++) { for (map<string,string>::const_iterator it = m_cache.begin(); it != m_cache.end(); it++) {
@@ -141,7 +143,7 @@ BuildVars::save()
} }
std::ofstream stream(m_filename, std::ofstream::binary); std::ofstream stream(m_filename, std::ofstream::binary);
writer.write(stream, json); writer->write(json, &stream);
} }
string string
@@ -212,8 +214,9 @@ read_modules(const string& buildOut, const string& device, map<string,Module>* r
} }
Json::Value json; Json::Value json;
Json::Reader reader; Json::CharReaderBuilder builder;
if (!reader.parse(stream, json)) { std::string errorMessage;
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;
} }