diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-04 22:18:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-04 22:18:14 +0000 |
| commit | f9733941b6ccf0c0958e0541de4c26be5a05fa26 (patch) | |
| tree | ce1385e7612d697ae82ffe9a6d2e3454e99fad39 | |
| parent | 7b6c4c0df21c877f91080f09991307313be96a9f (diff) | |
| parent | 224f46945a868dfb39c1862a72c92a3a09a22832 (diff) | |
| download | development-simpleperf-release.tar.gz | |
Merge "Snap for 11526323 from adb147cf125ad95aa2f47433a50242a6e8bbec5c to simpleperf-release" into simpleperf-releasesimpleperf-release
32 files changed, 90 insertions, 401 deletions
diff --git a/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp b/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp index 57c68c688..f99aa615b 100644 --- a/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp +++ b/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp @@ -346,6 +346,17 @@ static bool CompareSizeAndAlignment(const TypeIR *old_type, old_type->GetAlignment() == new_type->GetAlignment(); } +DiffStatus AbiDiffHelper::CompareAccess(AccessSpecifierIR old_access, + AccessSpecifierIR new_access) { + if (old_access == new_access) { + return DiffStatus::kNoDiff; + } + if (old_access > new_access) { + return DiffStatus::kDirectExt; + } + return DiffStatus::kDirectDiff; +} + DiffStatus AbiDiffHelper::CompareCommonRecordFields( const RecordFieldIR *old_field, const RecordFieldIR *new_field, DiffMessageIR::DiffKind diff_kind) { @@ -355,12 +366,11 @@ DiffStatus AbiDiffHelper::CompareCommonRecordFields( // CompareAndDumpTypeDiff should not return kDirectExt. // In case it happens, report an incompatible diff for review. if (field_diff_status.IsExtension() || - old_field->GetOffset() != new_field->GetOffset() || - // TODO: Should this be an inquality check instead ? Some compilers can - // make signatures dependant on absolute values of access specifiers. - IsAccessDowngraded(old_field->GetAccess(), new_field->GetAccess())) { + old_field->GetOffset() != new_field->GetOffset()) { field_diff_status.CombineWith(DiffStatus::kDirectDiff); } + field_diff_status.CombineWith( + CompareAccess(old_field->GetAccess(), new_field->GetAccess())); return field_diff_status; } @@ -603,8 +613,10 @@ DiffStatus AbiDiffHelper::CompareRecordTypes( record_type_diff_ir->SetName(old_type->GetName()); record_type_diff_ir->SetLinkerSetKey(old_type->GetLinkerSetKey()); - if (IsAccessDowngraded(old_type->GetAccess(), new_type->GetAccess())) { - final_diff_status.CombineWith(DiffStatus::kDirectDiff); + DiffStatus access_diff_status = + CompareAccess(old_type->GetAccess(), new_type->GetAccess()); + final_diff_status.CombineWith(access_diff_status); + if (access_diff_status.HasDiff()) { record_type_diff_ir->SetAccessDiff( std::make_unique<AccessSpecifierDiffIR>( old_type->GetAccess(), new_type->GetAccess())); diff --git a/vndk/tools/header-checker/src/repr/abi_diff_helpers.h b/vndk/tools/header-checker/src/repr/abi_diff_helpers.h index a0bd384c4..5604358ba 100644 --- a/vndk/tools/header-checker/src/repr/abi_diff_helpers.h +++ b/vndk/tools/header-checker/src/repr/abi_diff_helpers.h @@ -176,6 +176,9 @@ class AbiDiffHelper { FixupDiffedFieldTypeIds( const std::vector<RecordFieldDiffIR> &field_diffs); + DiffStatus CompareAccess(AccessSpecifierIR old_access, + AccessSpecifierIR new_access); + DiffStatus CompareCommonRecordFields(const RecordFieldIR *old_field, const RecordFieldIR *new_field, IRDiffDumper::DiffKind diff_kind); diff --git a/vndk/tools/header-checker/src/repr/ir_representation.h b/vndk/tools/header-checker/src/repr/ir_representation.h index ee186ae2b..8f76f650c 100644 --- a/vndk/tools/header-checker/src/repr/ir_representation.h +++ b/vndk/tools/header-checker/src/repr/ir_representation.h @@ -65,16 +65,12 @@ static inline CompatibilityStatusIR operator&(CompatibilityStatusIR f, } enum AccessSpecifierIR { + // Ordered from the least to the most restricted. PublicAccess = 1, ProtectedAccess = 2, PrivateAccess = 3 }; -static inline bool IsAccessDowngraded(AccessSpecifierIR old_access, - AccessSpecifierIR new_access) { - return old_access < new_access; -} - enum LinkableMessageKind { RecordTypeKind, EnumTypeKind, diff --git a/vndk/tools/header-checker/src/repr/json/ir_dumper.cpp b/vndk/tools/header-checker/src/repr/json/ir_dumper.cpp index 0b8f966a7..bf9e38ed5 100644 --- a/vndk/tools/header-checker/src/repr/json/ir_dumper.cpp +++ b/vndk/tools/header-checker/src/repr/json/ir_dumper.cpp @@ -81,13 +81,23 @@ void IRToJsonConverter::AddTemplateInfo( void IRToJsonConverter::AddTypeInfo(JsonObject &type_decl, const TypeIR *type_ir) { - type_decl.Set("linker_set_key", type_ir->GetLinkerSetKey()); + // LinkableMessageIR type_decl.Set("source_file", type_ir->GetSourceFile()); + const std::string &linker_set_key = type_ir->GetLinkerSetKey(); + type_decl.Set("linker_set_key", linker_set_key); + // TypeIR type_decl.Set("name", type_ir->GetName()); type_decl.Set("size", (uint64_t)type_ir->GetSize()); type_decl.Set("alignment", (uint64_t)type_ir->GetAlignment()); - type_decl.Set("referenced_type", type_ir->GetReferencedType()); - type_decl.Set("self_type", type_ir->GetSelfType()); + const std::string &self_type = type_ir->GetSelfType(); + if (self_type != linker_set_key) { + type_decl.Set("self_type", self_type); + } + // ReferencesOtherType + const std::string &referenced_type = type_ir->GetReferencedType(); + if (referenced_type != self_type) { + type_decl.Set("referenced_type", referenced_type); + } } static JsonObject ConvertRecordFieldIR(const RecordFieldIR *record_field_ir) { @@ -233,11 +243,18 @@ JsonObject IRToJsonConverter::ConvertEnumTypeIR(const EnumTypeIR *enump) { JsonObject IRToJsonConverter::ConvertGlobalVarIR(const GlobalVarIR *global_varp) { JsonObject global_var; - global_var.Set("referenced_type", global_varp->GetReferencedType()); - global_var.Set("source_file", global_varp->GetSourceFile()); + // GlobalVarIR global_var.Set("name", global_varp->GetName()); - global_var.Set("linker_set_key", global_varp->GetLinkerSetKey()); AddAccess(global_var, global_varp->GetAccess()); + // LinkableMessageIR + global_var.Set("source_file", global_varp->GetSourceFile()); + const std::string &linker_set_key = global_varp->GetLinkerSetKey(); + global_var.Set("linker_set_key", linker_set_key); + // ReferencesOtherType + const std::string &referenced_type = global_varp->GetReferencedType(); + if (linker_set_key != referenced_type) { + global_var.Set("referenced_type", referenced_type); + } return global_var; } diff --git a/vndk/tools/header-checker/src/repr/json/ir_reader.cpp b/vndk/tools/header-checker/src/repr/json/ir_reader.cpp index 14a15acf9..51e1087c8 100644 --- a/vndk/tools/header-checker/src/repr/json/ir_reader.cpp +++ b/vndk/tools/header-checker/src/repr/json/ir_reader.cpp @@ -92,6 +92,12 @@ std::string JsonObjectRef::GetString(const std::string &key) const { return Get(key, json_empty_string, &Json::Value::isString).asString(); } +std::string JsonObjectRef::GetString(const std::string &key, + const std::string &default_value) const { + return Get(key, Json::Value(default_value), &Json::Value::isString) + .asString(); +} + JsonObjectRef JsonObjectRef::GetObject(const std::string &key) const { return JsonObjectRef(Get(key, json_empty_object, &Json::Value::isObject), ok_); @@ -207,13 +213,18 @@ void JsonIRReader::ReadTemplateInfo(const JsonObjectRef &type_decl, void JsonIRReader::ReadTypeInfo(const JsonObjectRef &type_decl, TypeIR *type_ir) { - type_ir->SetLinkerSetKey(type_decl.GetString("linker_set_key")); + // LinkableMessageIR type_ir->SetSourceFile(type_decl.GetString("source_file")); + type_ir->SetLinkerSetKey(type_decl.GetString("linker_set_key")); + // TypeIR type_ir->SetName(type_decl.GetString("name")); - type_ir->SetReferencedType(type_decl.GetString("referenced_type")); - type_ir->SetSelfType(type_decl.GetString("self_type")); type_ir->SetSize(type_decl.GetUint("size")); type_ir->SetAlignment(type_decl.GetUint("alignment")); + type_ir->SetSelfType( + type_decl.GetString("self_type", type_ir->GetLinkerSetKey())); + // ReferencesOtherType + type_ir->SetReferencedType( + type_decl.GetString("referenced_type", type_ir->GetSelfType())); } void JsonIRReader::ReadRecordFields(const JsonObjectRef &record_type, @@ -319,13 +330,16 @@ EnumTypeIR JsonIRReader::EnumTypeJsonToIR(const JsonObjectRef &enum_type) { void JsonIRReader::ReadGlobalVariables(const JsonObjectRef &tu) { for (auto &&global_variable : tu.GetObjects("global_vars")) { GlobalVarIR global_variable_ir; + // GlobalVarIR global_variable_ir.SetName(global_variable.GetString("name")); global_variable_ir.SetAccess(GetAccess(global_variable)); + // LinkableMessageIR global_variable_ir.SetSourceFile(global_variable.GetString("source_file")); - global_variable_ir.SetReferencedType( - global_variable.GetString("referenced_type")); global_variable_ir.SetLinkerSetKey( global_variable.GetString("linker_set_key")); + // ReferencesOtherType + global_variable_ir.SetReferencedType(global_variable.GetString( + "referenced_type", global_variable_ir.GetLinkerSetKey())); module_->AddGlobalVariable(std::move(global_variable_ir)); } } diff --git a/vndk/tools/header-checker/src/repr/json/ir_reader.h b/vndk/tools/header-checker/src/repr/json/ir_reader.h index c95337ce2..ce13d3710 100644 --- a/vndk/tools/header-checker/src/repr/json/ir_reader.h +++ b/vndk/tools/header-checker/src/repr/json/ir_reader.h @@ -52,6 +52,9 @@ class JsonObjectRef { // Default to "". std::string GetString(const std::string &key) const; + std::string GetString(const std::string &key, + const std::string &default_value) const; + // Default to {}. JsonObjectRef GetObject(const std::string &key) const; diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump index 3f1c7611b..fcdcc18b8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump @@ -6,8 +6,6 @@ "alignment" : 4, "linker_set_key" : "_ZTIf", "name" : "float", - "referenced_type" : "_ZTIf", - "self_type" : "_ZTIf", "size" : 4 }, { @@ -15,8 +13,6 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { @@ -25,15 +21,11 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "_ZTIj", - "self_type" : "_ZTIj", "size" : 4 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -104,8 +96,6 @@ ], "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE", "name" : "SuperSpeaker::Volume", - "referenced_type" : "_ZTIN12SuperSpeaker6VolumeE", - "self_type" : "_ZTIN12SuperSpeaker6VolumeE", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "underlying_type" : "_ZTIj" @@ -230,7 +220,6 @@ "linker_set_key" : "_ZTIP12SuperSpeaker", "name" : "SuperSpeaker *", "referenced_type" : "_ZTI12SuperSpeaker", - "self_type" : "_ZTIP12SuperSpeaker", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, @@ -239,7 +228,6 @@ "linker_set_key" : "_ZTIP16LowVolumeSpeaker", "name" : "LowVolumeSpeaker *", "referenced_type" : "_ZTI16LowVolumeSpeaker", - "self_type" : "_ZTIP16LowVolumeSpeaker", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, @@ -248,7 +236,6 @@ "linker_set_key" : "_ZTIP17HighVolumeSpeaker", "name" : "HighVolumeSpeaker *", "referenced_type" : "_ZTI17HighVolumeSpeaker", - "self_type" : "_ZTIP17HighVolumeSpeaker", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, @@ -257,7 +244,6 @@ "linker_set_key" : "_ZTIPf", "name" : "float *", "referenced_type" : "_ZTIf", - "self_type" : "_ZTIPf", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" } @@ -279,8 +265,6 @@ "linker_set_key" : "_ZTI12SuperSpeaker", "name" : "SuperSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI12SuperSpeaker", - "self_type" : "_ZTI12SuperSpeaker", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "vtable_components" : @@ -334,8 +318,6 @@ "linker_set_key" : "_ZTI16LowVolumeSpeaker", "name" : "LowVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI16LowVolumeSpeaker", - "self_type" : "_ZTI16LowVolumeSpeaker", "size" : 16, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "vtable_components" : @@ -374,8 +356,6 @@ "linker_set_key" : "_ZTI17HighVolumeSpeaker", "name" : "HighVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI17HighVolumeSpeaker", - "self_type" : "_ZTI17HighVolumeSpeaker", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "vtable_components" : diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/liballowed_function_extensions.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/liballowed_function_extensions.so.lsdump index 5a3620860..6b29c13cf 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/liballowed_function_extensions.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/liballowed_function_extensions.so.lsdump @@ -6,7 +6,6 @@ "linker_set_key" : "_ZTIA2_c", "name" : "char[2]", "referenced_type" : "_ZTIc", - "self_type" : "_ZTIA2_c", "size" : 2, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" } @@ -19,15 +18,11 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIc", "name" : "char", - "referenced_type" : "_ZTIc", - "self_type" : "_ZTIc", "size" : 1 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -125,7 +120,6 @@ "linker_set_key" : "_ZTIRA2_Kc", "name" : "const char (&)[2]", "referenced_type" : "_ZTIA2_Kc", - "self_type" : "_ZTIRA2_Kc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" }, @@ -134,7 +128,6 @@ "linker_set_key" : "_ZTIRc", "name" : "char &", "referenced_type" : "_ZTIc", - "self_type" : "_ZTIRc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" } @@ -146,7 +139,6 @@ "linker_set_key" : "_ZTIPKPKc", "name" : "const char *const *", "referenced_type" : "_ZTIKPKc", - "self_type" : "_ZTIPKPKc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" }, @@ -155,7 +147,6 @@ "linker_set_key" : "_ZTIPKc", "name" : "const char *", "referenced_type" : "_ZTIKc", - "self_type" : "_ZTIPKc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" }, @@ -164,7 +155,6 @@ "linker_set_key" : "_ZTIPPc", "name" : "char **", "referenced_type" : "_ZTIPc", - "self_type" : "_ZTIPPc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" }, @@ -173,7 +163,6 @@ "linker_set_key" : "_ZTIPc", "name" : "char *", "referenced_type" : "_ZTIc", - "self_type" : "_ZTIPc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" } @@ -186,7 +175,6 @@ "linker_set_key" : "_ZTIA2_Kc", "name" : "const char[2]", "referenced_type" : "_ZTIA2_c", - "self_type" : "_ZTIA2_Kc", "size" : 2, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" }, @@ -196,7 +184,6 @@ "linker_set_key" : "_ZTIKPKPKc", "name" : "const char *const *const", "referenced_type" : "_ZTIPKPKc", - "self_type" : "_ZTIKPKPKc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" }, @@ -206,7 +193,6 @@ "linker_set_key" : "_ZTIKPKc", "name" : "const char *const", "referenced_type" : "_ZTIPKc", - "self_type" : "_ZTIKPKc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" }, @@ -216,7 +202,6 @@ "linker_set_key" : "_ZTIKc", "name" : "const char", "referenced_type" : "_ZTIc", - "self_type" : "_ZTIKc", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" }, @@ -225,7 +210,6 @@ "linker_set_key" : "_ZTIV6Struct", "name" : "volatile Struct", "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTIV6Struct", "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" } ], @@ -237,7 +221,6 @@ "linker_set_key" : "_ZTIO6Struct", "name" : "Struct &&", "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTIO6Struct", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" }, @@ -246,7 +229,6 @@ "linker_set_key" : "_ZTIOV6Struct", "name" : "volatile Struct &&", "referenced_type" : "_ZTIV6Struct", - "self_type" : "_ZTIOV6Struct", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/extensions.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/liballowed_struct_extensions.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/liballowed_struct_extensions.so.lsdump index 4cb6da1ff..e900b53b9 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/liballowed_struct_extensions.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/liballowed_struct_extensions.so.lsdump @@ -6,7 +6,6 @@ "linker_set_key" : "_ZTIA2_i", "name" : "int[2]", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIA2_i", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h" } @@ -18,8 +17,6 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { @@ -27,15 +24,11 @@ "is_integral" : true, "linker_set_key" : "_ZTIs", "name" : "short", - "referenced_type" : "_ZTIs", - "self_type" : "_ZTIs", "size" : 2 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -73,7 +66,6 @@ "linker_set_key" : "_ZTIR7Struct1", "name" : "Struct1 &", "referenced_type" : "_ZTI7Struct1", - "self_type" : "_ZTIR7Struct1", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h" }, @@ -82,7 +74,6 @@ "linker_set_key" : "_ZTIR7Struct2", "name" : "Struct2 &", "referenced_type" : "_ZTI7Struct2", - "self_type" : "_ZTIR7Struct2", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h" }, @@ -91,7 +82,6 @@ "linker_set_key" : "_ZTIR7Vtable3", "name" : "Vtable3 &", "referenced_type" : "_ZTI7Vtable3", - "self_type" : "_ZTIR7Vtable3", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h" } @@ -103,7 +93,6 @@ "linker_set_key" : "_ZTIP7Vtable1", "name" : "Vtable1 *", "referenced_type" : "_ZTI7Vtable1", - "self_type" : "_ZTIP7Vtable1", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h" }, @@ -112,7 +101,6 @@ "linker_set_key" : "_ZTIP7Vtable2", "name" : "Vtable2 *", "referenced_type" : "_ZTI7Vtable2", - "self_type" : "_ZTIP7Vtable2", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h" }, @@ -121,7 +109,6 @@ "linker_set_key" : "_ZTIP7Vtable3", "name" : "Vtable3 *", "referenced_type" : "_ZTI7Vtable3", - "self_type" : "_ZTIP7Vtable3", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h" } @@ -155,8 +142,6 @@ ], "linker_set_key" : "_ZTI7Struct1", "name" : "Struct1", - "referenced_type" : "_ZTI7Struct1", - "self_type" : "_ZTI7Struct1", "size" : 12, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h" }, @@ -171,8 +156,6 @@ ], "linker_set_key" : "_ZTI7Struct2", "name" : "Struct2", - "referenced_type" : "_ZTI7Struct2", - "self_type" : "_ZTI7Struct2", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h" }, @@ -193,8 +176,6 @@ ], "linker_set_key" : "_ZTI7Vtable1", "name" : "Vtable1", - "referenced_type" : "_ZTI7Vtable1", - "self_type" : "_ZTI7Vtable1", "size" : 16, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h", "vtable_components" : @@ -241,8 +222,6 @@ ], "linker_set_key" : "_ZTI7Vtable2", "name" : "Vtable2", - "referenced_type" : "_ZTI7Vtable2", - "self_type" : "_ZTI7Vtable2", "size" : 16, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h", "vtable_components" : @@ -299,8 +278,6 @@ ], "linker_set_key" : "_ZTI7Vtable3", "name" : "Vtable3", - "referenced_type" : "_ZTI7Vtable3", - "self_type" : "_ZTI7Vtable3", "size" : 48, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h", "vtable_components" : @@ -419,8 +396,6 @@ "linker_set_key" : "_ZTIN7Struct26NestedE", "name" : "Struct2::Nested", "record_kind" : "union", - "referenced_type" : "_ZTIN7Struct26NestedE", - "self_type" : "_ZTIN7Struct26NestedE", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/extensions.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libanonymous_enum_odr.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libanonymous_enum_odr.so.lsdump index 4de60844d..cb23f2f0a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libanonymous_enum_odr.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libanonymous_enum_odr.so.lsdump @@ -8,8 +8,6 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIc", "name" : "char", - "referenced_type" : "_ZTIc", - "self_type" : "_ZTIc", "size" : 1 }, { @@ -18,8 +16,6 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "_ZTIj", - "self_type" : "_ZTIj", "size" : 4 } ], @@ -38,8 +34,6 @@ ], "linker_set_key" : "_ZTI2$A", "name" : "(unnamed)", - "referenced_type" : "_ZTI2$A", - "self_type" : "_ZTI2$A", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h", "underlying_type" : "_ZTIc" @@ -55,8 +49,6 @@ ], "linker_set_key" : "_ZTI2$B", "name" : "(unnamed)", - "referenced_type" : "_ZTI2$B", - "self_type" : "_ZTI2$B", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h", "underlying_type" : "_ZTIc" @@ -72,8 +64,6 @@ ], "linker_set_key" : "_ZTI21$FIRST_ANONYMOUS_ENUM", "name" : "(unnamed)", - "referenced_type" : "_ZTI21$FIRST_ANONYMOUS_ENUM", - "self_type" : "_ZTI21$FIRST_ANONYMOUS_ENUM", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/include_golden.h", "underlying_type" : "_ZTIj" @@ -93,8 +83,6 @@ ], "linker_set_key" : "_ZTIN3$_22$BE", "name" : "(unnamed)::(unnamed)", - "referenced_type" : "_ZTIN3$_22$BE", - "self_type" : "_ZTIN3$_22$BE", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h", "underlying_type" : "_ZTIj" @@ -114,8 +102,6 @@ ], "linker_set_key" : "_ZTIN3$_32$BE", "name" : "(unnamed)::(unnamed)", - "referenced_type" : "_ZTIN3$_32$BE", - "self_type" : "_ZTIN3$_32$BE", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h", "underlying_type" : "_ZTIj" @@ -141,8 +127,6 @@ "is_anonymous" : true, "linker_set_key" : "_ZTI3$_2", "name" : "(unnamed)", - "referenced_type" : "_ZTI3$_2", - "self_type" : "_ZTI3$_2", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h" }, @@ -158,8 +142,6 @@ "is_anonymous" : true, "linker_set_key" : "_ZTI3$_3", "name" : "(unnamed)", - "referenced_type" : "_ZTI3$_3", - "self_type" : "_ZTI3$_3", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libarray.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libarray.so.lsdump index 85c774435..37505848d 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libarray.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libarray.so.lsdump @@ -6,7 +6,6 @@ "linker_set_key" : "_ZTIA0_i", "name" : "int[0]", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIA0_i", "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" }, { @@ -14,7 +13,6 @@ "linker_set_key" : "_ZTIA10_i", "name" : "int[10]", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIA10_i", "size" : 40, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" }, @@ -23,7 +21,6 @@ "linker_set_key" : "_ZTIA1_i", "name" : "int[1]", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIA1_i", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" }, @@ -32,7 +29,6 @@ "linker_set_key" : "_ZTIA2_i", "name" : "int[2]", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIA2_i", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" }, @@ -41,7 +37,6 @@ "linker_set_key" : "_ZTIA_A10_i", "name" : "int[][10]", "referenced_type" : "_ZTIA10_i", - "self_type" : "_ZTIA_A10_i", "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" }, { @@ -49,7 +44,6 @@ "linker_set_key" : "_ZTIA_A1_i", "name" : "int[][1]", "referenced_type" : "_ZTIA1_i", - "self_type" : "_ZTIA_A1_i", "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" }, { @@ -57,7 +51,6 @@ "linker_set_key" : "_ZTIA_i", "name" : "int[]", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIA_i", "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" } ], @@ -68,15 +61,11 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -201,7 +190,6 @@ "linker_set_key" : "_ZTIR6Struct", "name" : "Struct &", "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTIR6Struct", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" }, @@ -210,7 +198,6 @@ "linker_set_key" : "_ZTIRA_A1_i", "name" : "int (&)[][1]", "referenced_type" : "_ZTIA_A1_i", - "self_type" : "_ZTIRA_A1_i", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" } @@ -222,7 +209,6 @@ "linker_set_key" : "_ZTIPA2_i", "name" : "int (*)[2]", "referenced_type" : "_ZTIA2_i", - "self_type" : "_ZTIPA2_i", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" }, @@ -231,7 +217,6 @@ "linker_set_key" : "_ZTIPA_A10_i", "name" : "int (*)[][10]", "referenced_type" : "_ZTIA_A10_i", - "self_type" : "_ZTIPA_A10_i", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" }, @@ -240,7 +225,6 @@ "linker_set_key" : "_ZTIPA_i", "name" : "int (*)[]", "referenced_type" : "_ZTIA_i", - "self_type" : "_ZTIPA_i", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" }, @@ -249,7 +233,6 @@ "linker_set_key" : "_ZTIPPi", "name" : "int **", "referenced_type" : "_ZTIPi", - "self_type" : "_ZTIPPi", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" }, @@ -258,7 +241,6 @@ "linker_set_key" : "_ZTIPi", "name" : "int *", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIPi", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" } @@ -277,8 +259,6 @@ ], "linker_set_key" : "_ZTI6Struct", "name" : "Struct", - "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTI6Struct", "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/base.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libarray_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libarray_diff.so.lsdump index b0153ddf7..a80f01c64 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libarray_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libarray_diff.so.lsdump @@ -6,7 +6,6 @@ "linker_set_key" : "_ZTIA10_A10_i", "name" : "int[10][10]", "referenced_type" : "_ZTIA10_i", - "self_type" : "_ZTIA10_A10_i", "size" : 400, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" }, @@ -15,7 +14,6 @@ "linker_set_key" : "_ZTIA10_i", "name" : "int[10]", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIA10_i", "size" : 40, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" }, @@ -24,7 +22,6 @@ "linker_set_key" : "_ZTIA11_i", "name" : "int[11]", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIA11_i", "size" : 44, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" }, @@ -33,7 +30,6 @@ "linker_set_key" : "_ZTIA2_s", "name" : "short[2]", "referenced_type" : "_ZTIs", - "self_type" : "_ZTIA2_s", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" }, @@ -42,7 +38,6 @@ "linker_set_key" : "_ZTIA_A11_i", "name" : "int[][11]", "referenced_type" : "_ZTIA11_i", - "self_type" : "_ZTIA_A11_i", "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" }, { @@ -50,7 +45,6 @@ "linker_set_key" : "_ZTIA_i", "name" : "int[]", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIA_i", "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" } ], @@ -61,8 +55,6 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { @@ -70,15 +62,11 @@ "is_integral" : true, "linker_set_key" : "_ZTIs", "name" : "short", - "referenced_type" : "_ZTIs", - "self_type" : "_ZTIs", "size" : 2 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -203,7 +191,6 @@ "linker_set_key" : "_ZTIR6Struct", "name" : "Struct &", "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTIR6Struct", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" }, @@ -212,7 +199,6 @@ "linker_set_key" : "_ZTIRA_A11_i", "name" : "int (&)[][11]", "referenced_type" : "_ZTIA_A11_i", - "self_type" : "_ZTIRA_A11_i", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" } @@ -224,7 +210,6 @@ "linker_set_key" : "_ZTIPA10_A10_i", "name" : "int (*)[10][10]", "referenced_type" : "_ZTIA10_A10_i", - "self_type" : "_ZTIPA10_A10_i", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" }, @@ -233,7 +218,6 @@ "linker_set_key" : "_ZTIPA10_i", "name" : "int (*)[10]", "referenced_type" : "_ZTIA10_i", - "self_type" : "_ZTIPA10_i", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" }, @@ -242,7 +226,6 @@ "linker_set_key" : "_ZTIPA2_s", "name" : "short (*)[2]", "referenced_type" : "_ZTIA2_s", - "self_type" : "_ZTIPA2_s", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" }, @@ -251,7 +234,6 @@ "linker_set_key" : "_ZTIPPi", "name" : "int **", "referenced_type" : "_ZTIPi", - "self_type" : "_ZTIPPi", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" }, @@ -260,7 +242,6 @@ "linker_set_key" : "_ZTIPi", "name" : "int *", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIPi", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" } @@ -279,8 +260,6 @@ ], "linker_set_key" : "_ZTI6Struct", "name" : "Struct", - "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTI6Struct", "source_file" : "development/vndk/tools/header-checker/tests/integration/array/include/diff.h" } ], diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libdiff_multi_definitions.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libdiff_multi_definitions.so.lsdump index 2d2b3f60e..99df5c183 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libdiff_multi_definitions.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libdiff_multi_definitions.so.lsdump @@ -8,8 +8,6 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIc", "name" : "char", - "referenced_type" : "_ZTIc", - "self_type" : "_ZTIc", "size" : 1 }, { @@ -17,15 +15,11 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -93,7 +87,6 @@ "linker_set_key" : "_ZTIP18DefinedInOneHeader", "name" : "DefinedInOneHeader *", "referenced_type" : "_ZTI18DefinedInOneHeader", - "self_type" : "_ZTIP18DefinedInOneHeader", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/def1.h" }, @@ -102,7 +95,6 @@ "linker_set_key" : "_ZTIP6Opaque", "name" : "Opaque *", "referenced_type" : "_ZTI6Opaque", - "self_type" : "_ZTIP6Opaque", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/def1.h" }, @@ -111,7 +103,6 @@ "linker_set_key" : "_ZTIP6Struct", "name" : "Struct *", "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTIP6Struct", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/def1.h" }, @@ -132,8 +123,6 @@ "alignment" : 1, "linker_set_key" : "_ZTI18DefinedInOneHeader", "name" : "DefinedInOneHeader", - "referenced_type" : "_ZTI18DefinedInOneHeader", - "self_type" : "_ZTI18DefinedInOneHeader", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/link_to_def2.h" }, @@ -148,8 +137,6 @@ ], "linker_set_key" : "_ZTI6Struct", "name" : "Struct", - "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTI6Struct", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/def1.h" }, @@ -164,7 +151,6 @@ ], "linker_set_key" : "_ZTI6Struct", "name" : "Struct", - "referenced_type" : "_ZTI6Struct#ODR:/link_to_def2.h.sdump", "self_type" : "_ZTI6Struct#ODR:/link_to_def2.h.sdump", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/link_to_def2.h" diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libenum.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libenum.so.lsdump index 7a12c7ea5..3e612734d 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libenum.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libenum.so.lsdump @@ -7,8 +7,6 @@ "is_integral" : true, "linker_set_key" : "_ZTIa", "name" : "signed char", - "referenced_type" : "_ZTIa", - "self_type" : "_ZTIa", "size" : 1 }, { @@ -17,8 +15,6 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIh", "name" : "unsigned char", - "referenced_type" : "_ZTIh", - "self_type" : "_ZTIh", "size" : 1 }, { @@ -26,8 +22,6 @@ "is_integral" : true, "linker_set_key" : "_ZTIl", "name" : "long", - "referenced_type" : "_ZTIl", - "self_type" : "_ZTIl", "size" : 8 }, { @@ -36,15 +30,11 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIm", "name" : "unsigned long", - "referenced_type" : "_ZTIm", - "self_type" : "_ZTIm", "size" : 8 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -71,8 +61,6 @@ ], "linker_set_key" : "_ZTI4Int8", "name" : "Int8", - "referenced_type" : "_ZTI4Int8", - "self_type" : "_ZTI4Int8", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/enum/include/base.h", "underlying_type" : "_ZTIa" @@ -92,8 +80,6 @@ ], "linker_set_key" : "_ZTI5Int64", "name" : "Int64", - "referenced_type" : "_ZTI5Int64", - "self_type" : "_ZTI5Int64", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/enum/include/base.h", "underlying_type" : "_ZTIl" @@ -109,8 +95,6 @@ ], "linker_set_key" : "_ZTI5Uint8", "name" : "Uint8", - "referenced_type" : "_ZTI5Uint8", - "self_type" : "_ZTI5Uint8", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/enum/include/base.h", "underlying_type" : "_ZTIh" @@ -126,8 +110,6 @@ ], "linker_set_key" : "_ZTI6Uint64", "name" : "Uint64", - "referenced_type" : "_ZTI6Uint64", - "self_type" : "_ZTI6Uint64", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/enum/include/base.h", "underlying_type" : "_ZTIm" diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libfunction_extensions.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libfunction_extensions.so.lsdump index 9ad40a0d1..b49e8bec2 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libfunction_extensions.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libfunction_extensions.so.lsdump @@ -6,7 +6,6 @@ "linker_set_key" : "_ZTIA2_c", "name" : "char[2]", "referenced_type" : "_ZTIc", - "self_type" : "_ZTIA2_c", "size" : 2, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" } @@ -19,15 +18,11 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIc", "name" : "char", - "referenced_type" : "_ZTIc", - "self_type" : "_ZTIc", "size" : 1 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -125,7 +120,6 @@ "linker_set_key" : "_ZTIRA2_c", "name" : "char (&)[2]", "referenced_type" : "_ZTIA2_c", - "self_type" : "_ZTIRA2_c", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" }, @@ -134,7 +128,6 @@ "linker_set_key" : "_ZTIRKc", "name" : "const char &", "referenced_type" : "_ZTIKc", - "self_type" : "_ZTIRKc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" } @@ -146,7 +139,6 @@ "linker_set_key" : "_ZTIPKPKc", "name" : "const char *const *", "referenced_type" : "_ZTIKPKc", - "self_type" : "_ZTIPKPKc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" }, @@ -155,7 +147,6 @@ "linker_set_key" : "_ZTIPKc", "name" : "const char *", "referenced_type" : "_ZTIKc", - "self_type" : "_ZTIPKc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" }, @@ -164,7 +155,6 @@ "linker_set_key" : "_ZTIPPc", "name" : "char **", "referenced_type" : "_ZTIPc", - "self_type" : "_ZTIPPc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" }, @@ -173,7 +163,6 @@ "linker_set_key" : "_ZTIPc", "name" : "char *", "referenced_type" : "_ZTIc", - "self_type" : "_ZTIPc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" } @@ -186,7 +175,6 @@ "linker_set_key" : "_ZTIKPKc", "name" : "const char *const", "referenced_type" : "_ZTIPKc", - "self_type" : "_ZTIKPKc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" }, @@ -196,7 +184,6 @@ "linker_set_key" : "_ZTIKc", "name" : "const char", "referenced_type" : "_ZTIc", - "self_type" : "_ZTIKc", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" }, @@ -205,7 +192,6 @@ "linker_set_key" : "_ZTIV6Struct", "name" : "volatile Struct", "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTIV6Struct", "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" }, { @@ -214,7 +200,6 @@ "linker_set_key" : "_ZTIrPc", "name" : "char *__restrict", "referenced_type" : "_ZTIPc", - "self_type" : "_ZTIrPc", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" } @@ -227,7 +212,6 @@ "linker_set_key" : "_ZTIO6Struct", "name" : "Struct &&", "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTIO6Struct", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" }, @@ -236,7 +220,6 @@ "linker_set_key" : "_ZTIOV6Struct", "name" : "volatile Struct &&", "referenced_type" : "_ZTIV6Struct", - "self_type" : "_ZTIOV6Struct", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/function_extensions/include/base.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_anonymous_enum.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_anonymous_enum.so.lsdump index fd7beff43..25d9118db 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_anonymous_enum.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_anonymous_enum.so.lsdump @@ -8,8 +8,6 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIc", "name" : "char", - "referenced_type" : "_ZTIc", - "self_type" : "_ZTIc", "size" : 1 }, { @@ -18,8 +16,6 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "_ZTIj", - "self_type" : "_ZTIj", "size" : 4 } ], @@ -38,8 +34,6 @@ ], "linker_set_key" : "_ZTI2$A", "name" : "(unnamed)", - "referenced_type" : "_ZTI2$A", - "self_type" : "_ZTI2$A", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h", "underlying_type" : "_ZTIc" @@ -55,8 +49,6 @@ ], "linker_set_key" : "_ZTI2$B", "name" : "(unnamed)", - "referenced_type" : "_ZTI2$B", - "self_type" : "_ZTI2$B", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h", "underlying_type" : "_ZTIc" @@ -76,8 +68,6 @@ ], "linker_set_key" : "_ZTIN3$_22$BE", "name" : "(unnamed)::(unnamed)", - "referenced_type" : "_ZTIN3$_22$BE", - "self_type" : "_ZTIN3$_22$BE", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h", "underlying_type" : "_ZTIj" @@ -103,8 +93,6 @@ "is_anonymous" : true, "linker_set_key" : "_ZTI3$_2", "name" : "(unnamed)", - "referenced_type" : "_ZTI3$_2", - "self_type" : "_ZTI3$_2", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump index 90193c13d..4f0e9a7b5 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump @@ -6,8 +6,6 @@ "alignment" : 4, "linker_set_key" : "_ZTIf", "name" : "float", - "referenced_type" : "_ZTIf", - "self_type" : "_ZTIf", "size" : 4 }, { @@ -15,8 +13,6 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { @@ -25,15 +21,11 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "_ZTIj", - "self_type" : "_ZTIj", "size" : 4 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -104,8 +96,6 @@ ], "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE", "name" : "SuperSpeaker::Volume", - "referenced_type" : "_ZTIN12SuperSpeaker6VolumeE", - "self_type" : "_ZTIN12SuperSpeaker6VolumeE", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "underlying_type" : "_ZTIj" @@ -230,7 +220,6 @@ "linker_set_key" : "_ZTIP12SuperSpeaker", "name" : "SuperSpeaker *", "referenced_type" : "_ZTI12SuperSpeaker", - "self_type" : "_ZTIP12SuperSpeaker", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, @@ -239,7 +228,6 @@ "linker_set_key" : "_ZTIP16LowVolumeSpeaker", "name" : "LowVolumeSpeaker *", "referenced_type" : "_ZTI16LowVolumeSpeaker", - "self_type" : "_ZTIP16LowVolumeSpeaker", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, @@ -248,7 +236,6 @@ "linker_set_key" : "_ZTIP17HighVolumeSpeaker", "name" : "HighVolumeSpeaker *", "referenced_type" : "_ZTI17HighVolumeSpeaker", - "self_type" : "_ZTIP17HighVolumeSpeaker", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, @@ -257,7 +244,6 @@ "linker_set_key" : "_ZTIPf", "name" : "float *", "referenced_type" : "_ZTIf", - "self_type" : "_ZTIPf", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" } @@ -279,8 +265,6 @@ "linker_set_key" : "_ZTI12SuperSpeaker", "name" : "SuperSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI12SuperSpeaker", - "self_type" : "_ZTI12SuperSpeaker", "size" : 16, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "vtable_components" : @@ -334,8 +318,6 @@ "linker_set_key" : "_ZTI16LowVolumeSpeaker", "name" : "LowVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI16LowVolumeSpeaker", - "self_type" : "_ZTI16LowVolumeSpeaker", "size" : 24, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "vtable_components" : @@ -374,8 +356,6 @@ "linker_set_key" : "_ZTI17HighVolumeSpeaker", "name" : "HighVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI17HighVolumeSpeaker", - "self_type" : "_ZTI17HighVolumeSpeaker", "size" : 16, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "vtable_components" : diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libmerge_multi_definitions.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libmerge_multi_definitions.so.lsdump index 80abb8cf5..57e5d22be 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libmerge_multi_definitions.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libmerge_multi_definitions.so.lsdump @@ -8,8 +8,6 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIc", "name" : "char", - "referenced_type" : "_ZTIc", - "self_type" : "_ZTIc", "size" : 1 }, { @@ -17,15 +15,11 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -93,7 +87,6 @@ "linker_set_key" : "_ZTIP18DefinedInOneHeader", "name" : "DefinedInOneHeader *", "referenced_type" : "_ZTI18DefinedInOneHeader", - "self_type" : "_ZTIP18DefinedInOneHeader", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/def1.h" }, @@ -102,7 +95,6 @@ "linker_set_key" : "_ZTIP6Opaque", "name" : "Opaque *", "referenced_type" : "_ZTI6Opaque", - "self_type" : "_ZTIP6Opaque", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/def1.h" }, @@ -111,7 +103,6 @@ "linker_set_key" : "_ZTIP6Struct", "name" : "Struct *", "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTIP6Struct", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/def1.h" }, @@ -132,8 +123,6 @@ "alignment" : 1, "linker_set_key" : "_ZTI18DefinedInOneHeader", "name" : "DefinedInOneHeader", - "referenced_type" : "_ZTI18DefinedInOneHeader", - "self_type" : "_ZTI18DefinedInOneHeader", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/def2.h" }, @@ -148,8 +137,6 @@ ], "linker_set_key" : "_ZTI6Struct", "name" : "Struct", - "referenced_type" : "_ZTI6Struct", - "self_type" : "_ZTI6Struct", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/def1.h" }, @@ -164,7 +151,6 @@ ], "linker_set_key" : "_ZTI6Struct", "name" : "Struct", - "referenced_type" : "_ZTI6Struct#ODR:/def2.h.sdump", "self_type" : "_ZTI6Struct#ODR:/def2.h.sdump", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/merge_multi_definitions/include/def2.h" diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libopaque_type.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libopaque_type.so.lsdump index f54831115..2038f52a6 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libopaque_type.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libopaque_type.so.lsdump @@ -34,7 +34,6 @@ "linker_set_key" : "_ZTIP10OpaqueType", "name" : "OpaqueType *", "referenced_type" : "_ZTI10OpaqueType", - "self_type" : "_ZTIP10OpaqueType", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/opaque_type/include/opaque_type.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libparam_size_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libparam_size_diff.so.lsdump index 331ec285e..a85ef2acf 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libparam_size_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libparam_size_diff.so.lsdump @@ -7,15 +7,11 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -68,8 +64,6 @@ ], "linker_set_key" : "_ZTI6Return", "name" : "Return", - "referenced_type" : "_ZTI6Return", - "self_type" : "_ZTI6Return", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/pass_by_value/include/param_size_diff.h" }, @@ -89,8 +83,6 @@ ], "linker_set_key" : "_ZTI9Parameter", "name" : "Parameter", - "referenced_type" : "_ZTI9Parameter", - "self_type" : "_ZTI9Parameter", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/pass_by_value/include/param_size_diff.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libpass_by_value.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libpass_by_value.so.lsdump index d6598b9a7..504f3720a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libpass_by_value.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libpass_by_value.so.lsdump @@ -7,15 +7,11 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -68,8 +64,6 @@ ], "linker_set_key" : "_ZTI6Return", "name" : "Return", - "referenced_type" : "_ZTI6Return", - "self_type" : "_ZTI6Return", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/pass_by_value/include/base.h" }, @@ -84,8 +78,6 @@ ], "linker_set_key" : "_ZTI9Parameter", "name" : "Parameter", - "referenced_type" : "_ZTI9Parameter", - "self_type" : "_ZTI9Parameter", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/pass_by_value/include/base.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libreturn_size_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libreturn_size_diff.so.lsdump index 48b480fce..4afe00871 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libreturn_size_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libreturn_size_diff.so.lsdump @@ -7,15 +7,11 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -73,8 +69,6 @@ ], "linker_set_key" : "_ZTI6Return", "name" : "Return", - "referenced_type" : "_ZTI6Return", - "self_type" : "_ZTI6Return", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/pass_by_value/include/return_size_diff.h" }, @@ -89,8 +83,6 @@ ], "linker_set_key" : "_ZTI9Parameter", "name" : "Parameter", - "referenced_type" : "_ZTI9Parameter", - "self_type" : "_ZTI9Parameter", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/pass_by_value/include/return_size_diff.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libstruct_extensions.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libstruct_extensions.so.lsdump index 3afef988d..4dd467d72 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libstruct_extensions.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libstruct_extensions.so.lsdump @@ -7,8 +7,6 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { @@ -16,15 +14,11 @@ "is_integral" : true, "linker_set_key" : "_ZTIs", "name" : "short", - "referenced_type" : "_ZTIs", - "self_type" : "_ZTIs", "size" : 2 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -62,7 +56,6 @@ "linker_set_key" : "_ZTIR7Struct1", "name" : "Struct1 &", "referenced_type" : "_ZTI7Struct1", - "self_type" : "_ZTIR7Struct1", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h" }, @@ -71,7 +64,6 @@ "linker_set_key" : "_ZTIR7Struct2", "name" : "Struct2 &", "referenced_type" : "_ZTI7Struct2", - "self_type" : "_ZTIR7Struct2", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h" }, @@ -80,7 +72,6 @@ "linker_set_key" : "_ZTIR7Vtable3", "name" : "Vtable3 &", "referenced_type" : "_ZTI7Vtable3", - "self_type" : "_ZTIR7Vtable3", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h" } @@ -92,7 +83,6 @@ "linker_set_key" : "_ZTIP7Vtable1", "name" : "Vtable1 *", "referenced_type" : "_ZTI7Vtable1", - "self_type" : "_ZTIP7Vtable1", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h" }, @@ -101,7 +91,6 @@ "linker_set_key" : "_ZTIP7Vtable2", "name" : "Vtable2 *", "referenced_type" : "_ZTI7Vtable2", - "self_type" : "_ZTIP7Vtable2", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h" }, @@ -110,7 +99,6 @@ "linker_set_key" : "_ZTIP7Vtable3", "name" : "Vtable3 *", "referenced_type" : "_ZTI7Vtable3", - "self_type" : "_ZTIP7Vtable3", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h" } @@ -136,8 +124,6 @@ ], "linker_set_key" : "_ZTI7Struct1", "name" : "Struct1", - "referenced_type" : "_ZTI7Struct1", - "self_type" : "_ZTI7Struct1", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h" }, @@ -153,8 +139,6 @@ ], "linker_set_key" : "_ZTI7Struct2", "name" : "Struct2", - "referenced_type" : "_ZTI7Struct2", - "self_type" : "_ZTI7Struct2", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h" }, @@ -170,8 +154,6 @@ ], "linker_set_key" : "_ZTI7Vtable1", "name" : "Vtable1", - "referenced_type" : "_ZTI7Vtable1", - "self_type" : "_ZTI7Vtable1", "size" : 16, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h", "vtable_components" : @@ -209,8 +191,6 @@ ], "linker_set_key" : "_ZTI7Vtable2", "name" : "Vtable2", - "referenced_type" : "_ZTI7Vtable2", - "self_type" : "_ZTI7Vtable2", "size" : 16, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h", "vtable_components" : @@ -251,8 +231,6 @@ ], "linker_set_key" : "_ZTI7Vtable3", "name" : "Vtable3", - "referenced_type" : "_ZTI7Vtable3", - "self_type" : "_ZTI7Vtable3", "size" : 48, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h", "vtable_components" : @@ -340,8 +318,6 @@ "linker_set_key" : "_ZTIN7Struct26NestedE", "name" : "Struct2::Nested", "record_kind" : "union", - "referenced_type" : "_ZTIN7Struct26NestedE", - "self_type" : "_ZTIN7Struct26NestedE", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/struct_extensions/include/base.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libunion.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libunion.so.lsdump index 3bb451a2a..4f323c72d 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libunion.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libunion.so.lsdump @@ -6,7 +6,6 @@ "linker_set_key" : "_ZTIA0_c", "name" : "char[0]", "referenced_type" : "_ZTIc", - "self_type" : "_ZTIA0_c", "source_file" : "development/vndk/tools/header-checker/tests/integration/union/include/base.h" }, { @@ -14,7 +13,6 @@ "linker_set_key" : "_ZTIA0_i", "name" : "int[0]", "referenced_type" : "_ZTIi", - "self_type" : "_ZTIA0_i", "source_file" : "development/vndk/tools/header-checker/tests/integration/union/include/base.h" } ], @@ -26,8 +24,6 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIc", "name" : "char", - "referenced_type" : "_ZTIc", - "self_type" : "_ZTIc", "size" : 1 }, { @@ -35,15 +31,11 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -105,8 +97,6 @@ "linker_set_key" : "_ZTI10ChangeType", "name" : "ChangeType", "record_kind" : "union", - "referenced_type" : "_ZTI10ChangeType", - "self_type" : "_ZTI10ChangeType", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/union/include/base.h" }, @@ -136,8 +126,6 @@ ], "linker_set_key" : "_ZTI18ChangeTypeInStruct", "name" : "ChangeTypeInStruct", - "referenced_type" : "_ZTI18ChangeTypeInStruct", - "self_type" : "_ZTI18ChangeTypeInStruct", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/union/include/base.h" }, @@ -157,8 +145,6 @@ "linker_set_key" : "_ZTI4Swap", "name" : "Swap", "record_kind" : "union", - "referenced_type" : "_ZTI4Swap", - "self_type" : "_ZTI4Swap", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/union/include/base.h" }, @@ -178,8 +164,6 @@ "linker_set_key" : "_ZTI6Rename", "name" : "Rename", "record_kind" : "union", - "referenced_type" : "_ZTI6Rename", - "self_type" : "_ZTI6Rename", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/union/include/base.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example.so.lsdump index c06b336fb..2dd83e59f 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example.so.lsdump @@ -4,9 +4,7 @@ [ { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -77,7 +75,6 @@ "linker_set_key" : "_ZTIP5Test3", "name" : "Test3 *", "referenced_type" : "_ZTI5Test3", - "self_type" : "_ZTIP5Test3", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -86,7 +83,6 @@ "linker_set_key" : "_ZTIP5Test4", "name" : "Test4 *", "referenced_type" : "_ZTI5Test4", - "self_type" : "_ZTIP5Test4", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } @@ -99,8 +95,6 @@ "linker_set_key" : "_ZTI5Test3", "name" : "Test3", "record_kind" : "class", - "referenced_type" : "_ZTI5Test3", - "self_type" : "_ZTI5Test3", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -109,8 +103,6 @@ "linker_set_key" : "_ZTI5Test4", "name" : "Test4", "record_kind" : "class", - "referenced_type" : "_ZTI5Test4", - "self_type" : "_ZTI5Test4", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_api_level.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_api_level.so.lsdump index 9acf402bf..2459ae392 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_api_level.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_api_level.so.lsdump @@ -4,9 +4,7 @@ [ { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -36,7 +34,6 @@ "linker_set_key" : "_ZTIP5Test3", "name" : "Test3 *", "referenced_type" : "_ZTI5Test3", - "self_type" : "_ZTIP5Test3", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -45,7 +42,6 @@ "linker_set_key" : "_ZTIP5Test4", "name" : "Test4 *", "referenced_type" : "_ZTI5Test4", - "self_type" : "_ZTIP5Test4", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } @@ -58,8 +54,6 @@ "linker_set_key" : "_ZTI5Test3", "name" : "Test3", "record_kind" : "class", - "referenced_type" : "_ZTI5Test3", - "self_type" : "_ZTI5Test3", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -68,8 +62,6 @@ "linker_set_key" : "_ZTI5Test4", "name" : "Test4", "record_kind" : "class", - "referenced_type" : "_ZTI5Test4", - "self_type" : "_ZTI5Test4", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_mytag.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_mytag.so.lsdump index 9acf402bf..2459ae392 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_mytag.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_mytag.so.lsdump @@ -4,9 +4,7 @@ [ { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -36,7 +34,6 @@ "linker_set_key" : "_ZTIP5Test3", "name" : "Test3 *", "referenced_type" : "_ZTI5Test3", - "self_type" : "_ZTIP5Test3", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -45,7 +42,6 @@ "linker_set_key" : "_ZTIP5Test4", "name" : "Test4 *", "referenced_type" : "_ZTI5Test4", - "self_type" : "_ZTIP5Test4", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } @@ -58,8 +54,6 @@ "linker_set_key" : "_ZTI5Test3", "name" : "Test3", "record_kind" : "class", - "referenced_type" : "_ZTI5Test3", - "self_type" : "_ZTI5Test3", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -68,8 +62,6 @@ "linker_set_key" : "_ZTI5Test4", "name" : "Test4", "record_kind" : "class", - "referenced_type" : "_ZTI5Test4", - "self_type" : "_ZTI5Test4", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_private.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_private.so.lsdump index c1d84dbff..71c77c040 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_private.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_private.so.lsdump @@ -4,9 +4,7 @@ [ { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -52,7 +50,6 @@ "linker_set_key" : "_ZTIP5Test3", "name" : "Test3 *", "referenced_type" : "_ZTI5Test3", - "self_type" : "_ZTIP5Test3", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -61,7 +58,6 @@ "linker_set_key" : "_ZTIP5Test4", "name" : "Test4 *", "referenced_type" : "_ZTI5Test4", - "self_type" : "_ZTIP5Test4", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } @@ -74,8 +70,6 @@ "linker_set_key" : "_ZTI5Test3", "name" : "Test3", "record_kind" : "class", - "referenced_type" : "_ZTI5Test3", - "self_type" : "_ZTI5Test3", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" }, @@ -84,8 +78,6 @@ "linker_set_key" : "_ZTI5Test4", "name" : "Test4", "record_kind" : "class", - "referenced_type" : "_ZTI5Test4", - "self_type" : "_ZTI5Test4", "size" : 1, "source_file" : "development/vndk/tools/header-checker/tests/integration/version_script_example/example.h" } diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libweak_symbols_old.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libweak_symbols_old.so.lsdump index 2a066a330..ca4c8c628 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libweak_symbols_old.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libweak_symbols_old.so.lsdump @@ -4,9 +4,7 @@ [ { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_json.so.lsdump index 3f1c7611b..fcdcc18b8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_json.so.lsdump @@ -6,8 +6,6 @@ "alignment" : 4, "linker_set_key" : "_ZTIf", "name" : "float", - "referenced_type" : "_ZTIf", - "self_type" : "_ZTIf", "size" : 4 }, { @@ -15,8 +13,6 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { @@ -25,15 +21,11 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "_ZTIj", - "self_type" : "_ZTIj", "size" : 4 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -104,8 +96,6 @@ ], "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE", "name" : "SuperSpeaker::Volume", - "referenced_type" : "_ZTIN12SuperSpeaker6VolumeE", - "self_type" : "_ZTIN12SuperSpeaker6VolumeE", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "underlying_type" : "_ZTIj" @@ -230,7 +220,6 @@ "linker_set_key" : "_ZTIP12SuperSpeaker", "name" : "SuperSpeaker *", "referenced_type" : "_ZTI12SuperSpeaker", - "self_type" : "_ZTIP12SuperSpeaker", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, @@ -239,7 +228,6 @@ "linker_set_key" : "_ZTIP16LowVolumeSpeaker", "name" : "LowVolumeSpeaker *", "referenced_type" : "_ZTI16LowVolumeSpeaker", - "self_type" : "_ZTIP16LowVolumeSpeaker", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, @@ -248,7 +236,6 @@ "linker_set_key" : "_ZTIP17HighVolumeSpeaker", "name" : "HighVolumeSpeaker *", "referenced_type" : "_ZTI17HighVolumeSpeaker", - "self_type" : "_ZTIP17HighVolumeSpeaker", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, @@ -257,7 +244,6 @@ "linker_set_key" : "_ZTIPf", "name" : "float *", "referenced_type" : "_ZTIf", - "self_type" : "_ZTIPf", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" } @@ -279,8 +265,6 @@ "linker_set_key" : "_ZTI12SuperSpeaker", "name" : "SuperSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI12SuperSpeaker", - "self_type" : "_ZTI12SuperSpeaker", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "vtable_components" : @@ -334,8 +318,6 @@ "linker_set_key" : "_ZTI16LowVolumeSpeaker", "name" : "LowVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI16LowVolumeSpeaker", - "self_type" : "_ZTI16LowVolumeSpeaker", "size" : 16, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "vtable_components" : @@ -374,8 +356,6 @@ "linker_set_key" : "_ZTI17HighVolumeSpeaker", "name" : "HighVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI17HighVolumeSpeaker", - "self_type" : "_ZTI17HighVolumeSpeaker", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "vtable_components" : diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_json.so.lsdump index 90193c13d..4f0e9a7b5 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_json.so.lsdump @@ -6,8 +6,6 @@ "alignment" : 4, "linker_set_key" : "_ZTIf", "name" : "float", - "referenced_type" : "_ZTIf", - "self_type" : "_ZTIf", "size" : 4 }, { @@ -15,8 +13,6 @@ "is_integral" : true, "linker_set_key" : "_ZTIi", "name" : "int", - "referenced_type" : "_ZTIi", - "self_type" : "_ZTIi", "size" : 4 }, { @@ -25,15 +21,11 @@ "is_unsigned" : true, "linker_set_key" : "_ZTIj", "name" : "unsigned int", - "referenced_type" : "_ZTIj", - "self_type" : "_ZTIj", "size" : 4 }, { "linker_set_key" : "_ZTIv", - "name" : "void", - "referenced_type" : "_ZTIv", - "self_type" : "_ZTIv" + "name" : "void" } ], "elf_functions" : @@ -104,8 +96,6 @@ ], "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE", "name" : "SuperSpeaker::Volume", - "referenced_type" : "_ZTIN12SuperSpeaker6VolumeE", - "self_type" : "_ZTIN12SuperSpeaker6VolumeE", "size" : 4, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "underlying_type" : "_ZTIj" @@ -230,7 +220,6 @@ "linker_set_key" : "_ZTIP12SuperSpeaker", "name" : "SuperSpeaker *", "referenced_type" : "_ZTI12SuperSpeaker", - "self_type" : "_ZTIP12SuperSpeaker", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h" }, @@ -239,7 +228,6 @@ "linker_set_key" : "_ZTIP16LowVolumeSpeaker", "name" : "LowVolumeSpeaker *", "referenced_type" : "_ZTI16LowVolumeSpeaker", - "self_type" : "_ZTIP16LowVolumeSpeaker", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" }, @@ -248,7 +236,6 @@ "linker_set_key" : "_ZTIP17HighVolumeSpeaker", "name" : "HighVolumeSpeaker *", "referenced_type" : "_ZTI17HighVolumeSpeaker", - "self_type" : "_ZTIP17HighVolumeSpeaker", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h" }, @@ -257,7 +244,6 @@ "linker_set_key" : "_ZTIPf", "name" : "float *", "referenced_type" : "_ZTIf", - "self_type" : "_ZTIPf", "size" : 8, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h" } @@ -279,8 +265,6 @@ "linker_set_key" : "_ZTI12SuperSpeaker", "name" : "SuperSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI12SuperSpeaker", - "self_type" : "_ZTI12SuperSpeaker", "size" : 16, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h", "vtable_components" : @@ -334,8 +318,6 @@ "linker_set_key" : "_ZTI16LowVolumeSpeaker", "name" : "LowVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI16LowVolumeSpeaker", - "self_type" : "_ZTI16LowVolumeSpeaker", "size" : 24, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h", "vtable_components" : @@ -374,8 +356,6 @@ "linker_set_key" : "_ZTI17HighVolumeSpeaker", "name" : "HighVolumeSpeaker", "record_kind" : "class", - "referenced_type" : "_ZTI17HighVolumeSpeaker", - "self_type" : "_ZTI17HighVolumeSpeaker", "size" : 16, "source_file" : "development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h", "vtable_components" : diff --git a/vndk/tools/header-checker/tests/test.py b/vndk/tools/header-checker/tests/test.py index 027a1a69a..0ca37e073 100755 --- a/vndk/tools/header-checker/tests/test.py +++ b/vndk/tools/header-checker/tests/test.py @@ -296,7 +296,7 @@ class HeaderCheckerTest(unittest.TestCase): def test_libgolden_cpp_internal_struct_access_upgraded(self): self.prepare_and_run_abi_diff_all_archs( "libgolden_cpp_internal_private_struct", - "libgolden_cpp_internal_public_struct", 0, [], True, True) + "libgolden_cpp_internal_public_struct", 4, [], True, True) def test_libgolden_cpp_internal_struct_access_downgraded(self): self.prepare_and_run_abi_diff_all_archs( |