Merge "Remove trailing spaces from JSON dump"

am: 83e7410d9b

Change-Id: I9f52f84f217df7295162ba408843f2351eb60c9a

vndk/tools/header-checker/header-abi-util/src/ir_representation_json.cpp

@@ -19,6 +19,7 @@
 
 #include <cstdlib>
 #include <fstream>
+#include <sstream>
 #include <string>
 
 namespace abi_util {
@@ -394,10 +395,40 @@ bool JsonIRDumper::AddElfSymbolMessageIR(const ElfSymbolIR *elf_symbol_ir) {
   return true;
 }
 
-bool JsonIRDumper::Dump() {
+static std::string DumpJson(const JsonObject &obj) {
-  std::ofstream output(dump_path_);
+  std::ostringstream output_stream;
   Json::StyledStreamWriter writer(/* indentation */ " ");
-  writer.write(output, translation_unit_);
+  writer.write(output_stream, obj);
+  return output_stream.str();
+}
+
+static void WriteTailTrimmedLinesToFile(const std::string &path,
+                                        const std::string &output_string) {
+  std::ofstream output_file(path);
+  size_t line_start = 0;
+  while (line_start < output_string.size()) {
+    size_t trailing_space_start = line_start;
+    size_t index;
+    for (index = line_start;
+         index < output_string.size() && output_string[index] != '\n';
+         index++) {
+      if (output_string[index] != ' ') {
+        trailing_space_start = index + 1;
+      }
+    }
+    // Only write this line if this line contains non-whitespace characters.
+    if (trailing_space_start != line_start) {
+      output_file.write(output_string.data() + line_start,
+                        trailing_space_start - line_start);
+      output_file.write("\n", 1);
+    }
+    line_start = index + 1;
+  }
+}
+
+bool JsonIRDumper::Dump() {
+  std::string output_string = DumpJson(translation_unit_);
+  WriteTailTrimmedLinesToFile(dump_path_, output_string);
   return true;
 }
 

vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump

@@ -1,9 +1,7 @@
-
 {
  "array_types" : [],
  "builtin_types" :
  [
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -18,7 +16,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : false,
@@ -33,7 +30,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : true,
@@ -48,7 +44,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -66,52 +61,42 @@
  ],
  "elf_functions" :
  [
-  
   {
    "binding" : "global",
    "name" : "_Z26test_virtual_function_callP12SuperSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12NotReferenced"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker11SpeakLouderEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker9SpeakLoudEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker6ListenEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker11BadPracticeEf"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker6ListenEv"
@@ -119,12 +104,10 @@
  ],
  "elf_objects" :
  [
-  
   {
    "binding" : "global",
    "name" : "_ZTV16LowVolumeSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZTV17HighVolumeSpeaker"
@@ -132,27 +115,22 @@
  ],
  "enum_types" :
  [
-  
   {
    "access" : "private",
    "enum_fields" :
    [
-    
     {
      "enum_field_value" : 1,
      "name" : "SuperSpeaker::Volume::Loud"
     },
-    
     {
      "enum_field_value" : 2,
      "name" : "SuperSpeaker::Volume::Louder"
     },
-    
     {
      "enum_field_value" : 3,
      "name" : "SuperSpeaker::Volume::Loudest"
     },
-    
     {
      "enum_field_value" : 4,
      "name" : "SuperSpeaker::Volume::Lower"
@@ -178,14 +156,12 @@
  "function_types" : [],
  "functions" :
  [
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLouder",
    "linker_set_key" : "_ZN12SuperSpeaker11SpeakLouderEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -196,14 +172,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::CreateSuperSpeaker",
    "linker_set_key" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -214,14 +188,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLoud",
    "linker_set_key" : "_ZN12SuperSpeaker9SpeakLoudEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -232,14 +204,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN16LowVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -250,14 +220,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN16LowVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -268,20 +236,17 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::BadPractice",
    "linker_set_key" : "_ZN17HighVolumeSpeaker11BadPracticeEf",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
      "referenced_type" : "type-12"
     },
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -292,14 +257,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN17HighVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -310,14 +273,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN17HighVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -333,7 +294,6 @@
  "lvalue_reference_types" : [],
  "pointer_types" :
  [
-  
   {
    "type_info" :
    {
@@ -346,7 +306,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -359,7 +318,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -372,7 +330,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -389,13 +346,11 @@
  "qualified_types" : [],
  "record_types" :
  [
-  
   {
    "access" : "public",
    "base_specifiers" : [],
    "fields" :
    [
-    
     {
      "access" : "private",
      "field_name" : "mSpeakderId",
@@ -424,42 +379,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI12SuperSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -469,12 +418,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -503,42 +450,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -548,12 +489,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -562,14 +501,12 @@
    ],
    "fields" :
    [
-    
     {
      "access" : "public",
      "field_name" : "speaker_uint_t",
      "field_offset" : 64,
      "referenced_type" : "type-6"
     },
-    
     {
      "access" : "public",
      "field_name" : "speaker_float_star",
@@ -598,42 +535,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,

vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump

@@ -1,9 +1,7 @@
-
 {
  "array_types" : [],
  "builtin_types" :
  [
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -18,7 +16,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : false,
@@ -33,7 +30,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : true,
@@ -48,7 +44,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -66,52 +61,42 @@
  ],
  "elf_functions" :
  [
-  
   {
    "binding" : "global",
    "name" : "_Z26test_virtual_function_callP12SuperSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12NotReferenced"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker11SpeakLouderEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker9SpeakLoudEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker6ListenEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker11BadPracticeEf"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker6ListenEv"
@@ -119,12 +104,10 @@
  ],
  "elf_objects" :
  [
-  
   {
    "binding" : "global",
    "name" : "_ZTV16LowVolumeSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZTV17HighVolumeSpeaker"
@@ -132,27 +115,22 @@
  ],
  "enum_types" :
  [
-  
   {
    "access" : "private",
    "enum_fields" :
    [
-    
     {
      "enum_field_value" : 1,
      "name" : "SuperSpeaker::Volume::Loud"
     },
-    
     {
      "enum_field_value" : 2,
      "name" : "SuperSpeaker::Volume::Louder"
     },
-    
     {
      "enum_field_value" : 3,
      "name" : "SuperSpeaker::Volume::Loudest"
     },
-    
     {
      "enum_field_value" : 4,
      "name" : "SuperSpeaker::Volume::Lower"
@@ -178,14 +156,12 @@
  "function_types" : [],
  "functions" :
  [
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLouder",
    "linker_set_key" : "_ZN12SuperSpeaker11SpeakLouderEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -196,14 +172,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::CreateSuperSpeaker",
    "linker_set_key" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -214,14 +188,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLoud",
    "linker_set_key" : "_ZN12SuperSpeaker9SpeakLoudEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -232,14 +204,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN16LowVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -250,14 +220,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN16LowVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -268,20 +236,17 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::BadPractice",
    "linker_set_key" : "_ZN17HighVolumeSpeaker11BadPracticeEf",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
      "referenced_type" : "type-12"
     },
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -292,14 +257,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN17HighVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -310,14 +273,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN17HighVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -333,7 +294,6 @@
  "lvalue_reference_types" : [],
  "pointer_types" :
  [
-  
   {
    "type_info" :
    {
@@ -346,7 +306,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -359,7 +318,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -372,7 +330,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -389,13 +346,11 @@
  "qualified_types" : [],
  "record_types" :
  [
-  
   {
    "access" : "public",
    "base_specifiers" : [],
    "fields" :
    [
-    
     {
      "access" : "private",
      "field_name" : "mSpeakderId",
@@ -424,42 +379,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI12SuperSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -469,12 +418,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -503,42 +450,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -548,12 +489,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -562,14 +501,12 @@
    ],
    "fields" :
    [
-    
     {
      "access" : "public",
      "field_name" : "speaker_uint_t",
      "field_offset" : 96,
      "referenced_type" : "type-6"
     },
-    
     {
      "access" : "public",
      "field_name" : "speaker_float_star",
@@ -598,42 +535,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,

vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump

@@ -1,9 +1,7 @@
-
 {
  "array_types" : [],
  "builtin_types" :
  [
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -18,7 +16,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : false,
@@ -33,7 +30,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : true,
@@ -48,7 +44,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -66,52 +61,42 @@
  ],
  "elf_functions" :
  [
-  
   {
    "binding" : "global",
    "name" : "_Z26test_virtual_function_callP12SuperSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12NotReferenced"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker11SpeakLouderEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker9SpeakLoudEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker6ListenEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker11BadPracticeEf"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker6ListenEv"
@@ -119,12 +104,10 @@
  ],
  "elf_objects" :
  [
-  
   {
    "binding" : "global",
    "name" : "_ZTV16LowVolumeSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZTV17HighVolumeSpeaker"
@@ -132,27 +115,22 @@
  ],
  "enum_types" :
  [
-  
   {
    "access" : "private",
    "enum_fields" :
    [
-    
     {
      "enum_field_value" : 1,
      "name" : "SuperSpeaker::Volume::Loud"
     },
-    
     {
      "enum_field_value" : 2,
      "name" : "SuperSpeaker::Volume::Louder"
     },
-    
     {
      "enum_field_value" : 3,
      "name" : "SuperSpeaker::Volume::Loudest"
     },
-    
     {
      "enum_field_value" : 4,
      "name" : "SuperSpeaker::Volume::Lower"
@@ -178,14 +156,12 @@
  "function_types" : [],
  "functions" :
  [
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLouder",
    "linker_set_key" : "_ZN12SuperSpeaker11SpeakLouderEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -196,14 +172,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::CreateSuperSpeaker",
    "linker_set_key" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -214,14 +188,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLoud",
    "linker_set_key" : "_ZN12SuperSpeaker9SpeakLoudEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -232,14 +204,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN16LowVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -250,14 +220,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN16LowVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -268,20 +236,17 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::BadPractice",
    "linker_set_key" : "_ZN17HighVolumeSpeaker11BadPracticeEf",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
      "referenced_type" : "type-12"
     },
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -292,14 +257,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN17HighVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -310,14 +273,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN17HighVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -333,7 +294,6 @@
  "lvalue_reference_types" : [],
  "pointer_types" :
  [
-  
   {
    "type_info" :
    {
@@ -346,7 +306,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -359,7 +318,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -372,7 +330,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -389,13 +346,11 @@
  "qualified_types" : [],
  "record_types" :
  [
-  
   {
    "access" : "public",
    "base_specifiers" : [],
    "fields" :
    [
-    
     {
      "access" : "private",
      "field_name" : "mSpeakderId",
@@ -424,42 +379,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI12SuperSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -469,12 +418,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -503,42 +450,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -548,12 +489,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -562,14 +501,12 @@
    ],
    "fields" :
    [
-    
     {
      "access" : "public",
      "field_name" : "speaker_uint_t",
      "field_offset" : 64,
      "referenced_type" : "type-6"
     },
-    
     {
      "access" : "public",
      "field_name" : "speaker_float_star",
@@ -598,42 +535,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,

vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_json.so.lsdump

@@ -1,9 +1,7 @@
-
 {
  "array_types" : [],
  "builtin_types" :
  [
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -18,7 +16,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : false,
@@ -33,7 +30,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : true,
@@ -48,7 +44,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -66,52 +61,42 @@
  ],
  "elf_functions" :
  [
-  
   {
    "binding" : "global",
    "name" : "_Z26test_virtual_function_callP12SuperSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12NotReferenced"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker11SpeakLouderEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker9SpeakLoudEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker6ListenEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker11BadPracticeEf"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker6ListenEv"
@@ -119,12 +104,10 @@
  ],
  "elf_objects" :
  [
-  
   {
    "binding" : "global",
    "name" : "_ZTV16LowVolumeSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZTV17HighVolumeSpeaker"
@@ -132,27 +115,22 @@
  ],
  "enum_types" :
  [
-  
   {
    "access" : "private",
    "enum_fields" :
    [
-    
     {
      "enum_field_value" : 1,
      "name" : "SuperSpeaker::Volume::Loud"
     },
-    
     {
      "enum_field_value" : 2,
      "name" : "SuperSpeaker::Volume::Louder"
     },
-    
     {
      "enum_field_value" : 3,
      "name" : "SuperSpeaker::Volume::Loudest"
     },
-    
     {
      "enum_field_value" : 4,
      "name" : "SuperSpeaker::Volume::Lower"
@@ -178,14 +156,12 @@
  "function_types" : [],
  "functions" :
  [
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLouder",
    "linker_set_key" : "_ZN12SuperSpeaker11SpeakLouderEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -196,14 +172,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::CreateSuperSpeaker",
    "linker_set_key" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -214,14 +188,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLoud",
    "linker_set_key" : "_ZN12SuperSpeaker9SpeakLoudEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -232,14 +204,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN16LowVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -250,14 +220,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN16LowVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -268,20 +236,17 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::BadPractice",
    "linker_set_key" : "_ZN17HighVolumeSpeaker11BadPracticeEf",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
      "referenced_type" : "type-12"
     },
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -292,14 +257,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN17HighVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -310,14 +273,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN17HighVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -333,7 +294,6 @@
  "lvalue_reference_types" : [],
  "pointer_types" :
  [
-  
   {
    "type_info" :
    {
@@ -346,7 +306,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -359,7 +318,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -372,7 +330,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -389,13 +346,11 @@
  "qualified_types" : [],
  "record_types" :
  [
-  
   {
    "access" : "public",
    "base_specifiers" : [],
    "fields" :
    [
-    
     {
      "access" : "private",
      "field_name" : "mSpeakderId",
@@ -424,42 +379,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI12SuperSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -469,12 +418,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -503,42 +450,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -548,12 +489,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -562,14 +501,12 @@
    ],
    "fields" :
    [
-    
     {
      "access" : "public",
      "field_name" : "speaker_uint_t",
      "field_offset" : 96,
      "referenced_type" : "type-6"
     },
-    
     {
      "access" : "public",
      "field_name" : "speaker_float_star",
@@ -598,42 +535,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,

vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_json.so.lsdump

@@ -1,9 +1,7 @@
-
 {
  "array_types" : [],
  "builtin_types" :
  [
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -18,7 +16,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : false,
@@ -33,7 +30,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : true,
@@ -48,7 +44,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -66,52 +61,42 @@
  ],
  "elf_functions" :
  [
-  
   {
    "binding" : "global",
    "name" : "_Z26test_virtual_function_callP12SuperSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12NotReferenced"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker11SpeakLouderEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker9SpeakLoudEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker6ListenEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker11BadPracticeEf"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker6ListenEv"
@@ -119,12 +104,10 @@
  ],
  "elf_objects" :
  [
-  
   {
    "binding" : "global",
    "name" : "_ZTV16LowVolumeSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZTV17HighVolumeSpeaker"
@@ -132,27 +115,22 @@
  ],
  "enum_types" :
  [
-  
   {
    "access" : "private",
    "enum_fields" :
    [
-    
     {
      "enum_field_value" : 1,
      "name" : "SuperSpeaker::Volume::Loud"
     },
-    
     {
      "enum_field_value" : 2,
      "name" : "SuperSpeaker::Volume::Louder"
     },
-    
     {
      "enum_field_value" : 3,
      "name" : "SuperSpeaker::Volume::Loudest"
     },
-    
     {
      "enum_field_value" : 4,
      "name" : "SuperSpeaker::Volume::Lower"
@@ -178,14 +156,12 @@
  "function_types" : [],
  "functions" :
  [
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLouder",
    "linker_set_key" : "_ZN12SuperSpeaker11SpeakLouderEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -196,14 +172,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::CreateSuperSpeaker",
    "linker_set_key" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -214,14 +188,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLoud",
    "linker_set_key" : "_ZN12SuperSpeaker9SpeakLoudEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -232,14 +204,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN16LowVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -250,14 +220,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN16LowVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -268,20 +236,17 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::BadPractice",
    "linker_set_key" : "_ZN17HighVolumeSpeaker11BadPracticeEf",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
      "referenced_type" : "type-12"
     },
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -292,14 +257,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN17HighVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -310,14 +273,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN17HighVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -333,7 +294,6 @@
  "lvalue_reference_types" : [],
  "pointer_types" :
  [
-  
   {
    "type_info" :
    {
@@ -346,7 +306,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -359,7 +318,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -372,7 +330,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -389,13 +346,11 @@
  "qualified_types" : [],
  "record_types" :
  [
-  
   {
    "access" : "public",
    "base_specifiers" : [],
    "fields" :
    [
-    
     {
      "access" : "private",
      "field_name" : "mSpeakderId",
@@ -424,42 +379,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI12SuperSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -469,12 +418,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -503,42 +450,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -548,12 +489,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -562,14 +501,12 @@
    ],
    "fields" :
    [
-    
     {
      "access" : "public",
      "field_name" : "speaker_uint_t",
      "field_offset" : 64,
      "referenced_type" : "type-6"
     },
-    
     {
      "access" : "public",
      "field_name" : "speaker_float_star",
@@ -598,42 +535,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,

vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_json.so.lsdump

@@ -1,9 +1,7 @@
-
 {
  "array_types" : [],
  "builtin_types" :
  [
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -18,7 +16,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : false,
@@ -33,7 +30,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : true,
    "is_unsigned" : true,
@@ -48,7 +44,6 @@
     "source_file" : ""
    }
   },
-  
   {
    "is_integral" : false,
    "is_unsigned" : false,
@@ -66,52 +61,42 @@
  ],
  "elf_functions" :
  [
-  
   {
    "binding" : "global",
    "name" : "_Z26test_virtual_function_callP12SuperSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12NotReferenced"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker11SpeakLouderEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN12SuperSpeaker9SpeakLoudEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN16LowVolumeSpeaker6ListenEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker11BadPracticeEf"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker5SpeakEv"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZN17HighVolumeSpeaker6ListenEv"
@@ -119,12 +104,10 @@
  ],
  "elf_objects" :
  [
-  
   {
    "binding" : "global",
    "name" : "_ZTV16LowVolumeSpeaker"
   },
-  
   {
    "binding" : "global",
    "name" : "_ZTV17HighVolumeSpeaker"
@@ -132,27 +115,22 @@
  ],
  "enum_types" :
  [
-  
   {
    "access" : "private",
    "enum_fields" :
    [
-    
     {
      "enum_field_value" : 1,
      "name" : "SuperSpeaker::Volume::Loud"
     },
-    
     {
      "enum_field_value" : 2,
      "name" : "SuperSpeaker::Volume::Louder"
     },
-    
     {
      "enum_field_value" : 3,
      "name" : "SuperSpeaker::Volume::Loudest"
     },
-    
     {
      "enum_field_value" : 4,
      "name" : "SuperSpeaker::Volume::Lower"
@@ -178,14 +156,12 @@
  "function_types" : [],
  "functions" :
  [
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLouder",
    "linker_set_key" : "_ZN12SuperSpeaker11SpeakLouderEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -196,14 +172,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::CreateSuperSpeaker",
    "linker_set_key" : "_ZN12SuperSpeaker18CreateSuperSpeakerEi",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -214,14 +188,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "SuperSpeaker::SpeakLoud",
    "linker_set_key" : "_ZN12SuperSpeaker9SpeakLoudEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -232,14 +204,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN16LowVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -250,14 +220,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "LowVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN16LowVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -268,20 +236,17 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::BadPractice",
    "linker_set_key" : "_ZN17HighVolumeSpeaker11BadPracticeEf",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
      "referenced_type" : "type-12"
     },
-    
     {
      "default_arg" : false,
      "is_this_ptr" : false,
@@ -292,14 +257,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Speak",
    "linker_set_key" : "_ZN17HighVolumeSpeaker5SpeakEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -310,14 +273,12 @@
    "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
    "template_info" : []
   },
-  
   {
    "access" : "public",
    "function_name" : "HighVolumeSpeaker::Listen",
    "linker_set_key" : "_ZN17HighVolumeSpeaker6ListenEv",
    "parameters" :
    [
-    
     {
      "default_arg" : false,
      "is_this_ptr" : true,
@@ -333,7 +294,6 @@
  "lvalue_reference_types" : [],
  "pointer_types" :
  [
-  
   {
    "type_info" :
    {
@@ -346,7 +306,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -359,7 +318,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -372,7 +330,6 @@
     "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
    }
   },
-  
   {
    "type_info" :
    {
@@ -389,13 +346,11 @@
  "qualified_types" : [],
  "record_types" :
  [
-  
   {
    "access" : "public",
    "base_specifiers" : [],
    "fields" :
    [
-    
     {
      "access" : "private",
      "field_name" : "mSpeakderId",
@@ -424,42 +379,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI12SuperSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : true,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -469,12 +418,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -503,42 +450,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
@@ -548,12 +489,10 @@
     ]
    }
   },
-  
   {
    "access" : "public",
    "base_specifiers" :
    [
-    
     {
      "access" : "public",
      "is_virtual" : false,
@@ -562,14 +501,12 @@
    ],
    "fields" :
    [
-    
     {
      "access" : "public",
      "field_name" : "speaker_uint_t",
      "field_offset" : 96,
      "referenced_type" : "type-6"
     },
-    
     {
      "access" : "public",
      "field_name" : "speaker_float_star",
@@ -598,42 +535,36 @@
    {
     "vtable_components" :
     [
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "offset_to_top",
       "mangled_component_name" : ""
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "rtti",
       "mangled_component_name" : "_ZTI16LowVolumeSpeaker"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker5SpeakEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "function_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeaker6ListenEv"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,
       "kind" : "complete_dtor_pointer",
       "mangled_component_name" : "_ZN16LowVolumeSpeakerD1Ev"
      },
-     
      {
       "component_value" : 0,
       "is_pure" : false,