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

Merge "[bit] Use new jsoncpp API" am: c8379556c0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ided8274dc9cb5a63e7ab04f0612a3b04a2214c90
This commit is contained in:
Haibo Huang
2021-03-03 22:45:23 +00:00
committed by Automerger Merge Worker
parent 3cbc44875c c8379556c0
commit 14fff93b3f
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::Reader reader;
if (!reader.parse(stream, json)) {
Json::CharReaderBuilder builder;
std::string errorMessage;
if (!Json::parseFromStream(builder, stream, &json, &errorMessage)) {
return;
}
@@ -132,8 +133,9 @@ BuildVars::save()
return;
}
Json::StyledStreamWriter writer(" ");
Json::StreamWriterBuilder factory;
factory["indentation"] = " ";
std::unique_ptr<Json::StreamWriter> const writer(factory.newStreamWriter());
Json::Value json(Json::objectValue);
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);
writer.write(stream, json);
writer->write(json, &stream);
}
string
@@ -212,8 +214,9 @@ read_modules(const string& buildOut, const string& device, map<string,Module>* r
}
Json::Value json;
Json::Reader reader;
if (!reader.parse(stream, json)) {
Json::CharReaderBuilder builder;
std::string errorMessage;
if (!Json::parseFromStream(builder, stream, &json, &errorMessage)) {
json_error(filename, "can't parse json format", quiet);
return;
}