Merge "[vkjson] Use new jsoncpp API" am: e9b81a4000 am: 96938a7815

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1607278

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e34755a70b8aa20ef5958076b8dc389fbcdeb78

1 files changed, 4 insertions, 4 deletions

diff --git a/vulkan/vkjson/vkjson.cc b/vulkan/vkjson/vkjson.cc
index bfc240e4dd..a513239061 100644
--- a/vulkan/vkjson/vkjson.cc
+++ b/vulkan/vkjson/vkjson.cc
@@ -1196,10 +1196,10 @@ template <typename T> bool VkTypeFromJson(const std::string& json,
                                           std::string* errors) {
   *t = T();
   Json::Value object(Json::objectValue);
-  Json::Reader reader;
-  reader.parse(json, object, false);
-  if (!object) {
-    if (errors) errors->assign(reader.getFormatedErrorMessages());
+  Json::CharReaderBuilder builder;
+  builder["collectComments"] = false;
+  std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
+  if (!reader->parse(json.data(), json.data() + json.size(), &object, errors)) {
     return false;
   }
   return AsValue(&object, t);