diff --git a/vndk/tools/header-checker/Android.bp b/vndk/tools/header-checker/Android.bp index 979c2ffe6..0cbc55910 100644 --- a/vndk/tools/header-checker/Android.bp +++ b/vndk/tools/header-checker/Android.bp @@ -18,17 +18,20 @@ cc_defaults { name: "header-checker-defaults", defaults: [ - "clang-defaults", + "llvm-build-host-tools-defaults", ], cflags: [ "-Wall", "-Werror", + "-Wno-unused-parameter", "-DGOOGLE_PROTOBUF_NO_RTTI", "-UNDEBUG", ], cppflags: [ + "-fno-exceptions", + "-fno-rtti", "-std=c++14", ], @@ -37,6 +40,9 @@ cc_defaults { enabled: false, }, }, + + compile_multilib: "64", + stl: "none", } cc_binary_host { @@ -61,54 +67,32 @@ cc_binary_host { "libheader-abi-util", "libheader-checker-proto", "libjsoncpp", - "libclangToolingCore", - "libclangTooling", - "libclangFrontendTool", - "libclangFrontend", - "libclangDriver", - "libclangIndex", - "libclangSerialization", - "libclangCodeGen", - "libclangParse", - "libclangSema", - "libclangAnalysis", - "libclangEdit", - "libclangAST", - "libclangLex", - "libclangBasic", - "libLLVMBitReader", - "libLLVMBitWriter", - "libLLVMMC", - "libLLVMMCParser", - "libLLVMCore", - "libLLVMOption", - "libLLVMProfileData", - "libLLVMObject", - "libLLVMSupport", ], shared_libs: [ "libprotobuf-cpp-full", + "libLLVM_host", + "libclang_cxx_host", + "libc++_host", ], } cc_defaults { name: "header-abi-linker-defaults", + defaults: ["header-checker-defaults"], + static_libs: [ "libheader-abi-util", "libheader-checker-proto", "libjsoncpp", - "libLLVMObject", - "libLLVMBitReader", - "libLLVMMC", - "libLLVMMCParser", - "libLLVMCore", - "libLLVMSupport", ], shared_libs: [ "libprotobuf-cpp-full", + "libLLVM_host", + "libclang_cxx_host", + "libc++_host", ], } @@ -176,6 +160,8 @@ cc_library_host_static { ], shared_libs: [ + "libLLVM_host", + "libc++_host", "libprotobuf-cpp-full", ], diff --git a/vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp b/vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp index b801adb0b..b36e5ac98 100644 --- a/vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp +++ b/vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp @@ -87,17 +87,15 @@ static llvm::cl::opt allow_unreferenced_changes( static llvm::cl::opt consider_opaque_types_different( "consider-opaque-types-different", - llvm::cl::desc("Consider opaque types with different names as different" - " .This should not be used while comparing C++ library" - " ABIs"), + llvm::cl::desc("Consider opaque types with different names as different. " + "This should not be used while comparing C++ library ABIs"), llvm::cl::Optional, llvm::cl::cat(header_checker_category)); static llvm::cl::opt text_format_old( "input-format-old", llvm::cl::desc("Specify input format of old abi dump"), llvm::cl::values(clEnumValN(abi_util::TextFormatIR::ProtobufTextFormat, "ProtobufTextFormat", "ProtobufTextFormat"), - clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON"), - clEnumValEnd), + clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON")), llvm::cl::init(abi_util::TextFormatIR::Json), llvm::cl::cat(header_checker_category)); @@ -105,16 +103,14 @@ static llvm::cl::opt text_format_new( "input-format-new", llvm::cl::desc("Specify input format of new abi dump"), llvm::cl::values(clEnumValN(abi_util::TextFormatIR::ProtobufTextFormat, "ProtobufTextFormat", "ProtobufTextFormat"), - clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON"), - clEnumValEnd), + clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON")), llvm::cl::init(abi_util::TextFormatIR::Json), llvm::cl::cat(header_checker_category)); static llvm::cl::opt text_format_diff( "text-format-diff", llvm::cl::desc("Specify text format of abi-diff"), llvm::cl::values(clEnumValN(abi_util::TextFormatIR::ProtobufTextFormat, - "ProtobufTextFormat", "ProtobufTextFormat"), - clEnumValEnd), + "ProtobufTextFormat", "ProtobufTextFormat")), llvm::cl::init(abi_util::TextFormatIR::ProtobufTextFormat), llvm::cl::cat(header_checker_category)); diff --git a/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp b/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp index ef0aecf87..918196503 100644 --- a/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp +++ b/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -422,7 +422,8 @@ std::string ABIWrapper::QualTypeToString( if (salty_qt.getTypePtr()->isDependentType()) { return salty_qt.getAsString(); } - return clang::TypeName::getFullyQualifiedName(salty_qt, *ast_contextp_); + return clang::TypeName::getFullyQualifiedName( + salty_qt, *ast_contextp_, ast_contextp_->getPrintingPolicy()); } FunctionTypeWrapper::FunctionTypeWrapper( @@ -656,8 +657,9 @@ bool RecordDeclWrapper::SetupRecordVTable( } const clang::VTableLayout &vtable_layout = itanium_vtable_contextp->getVTableLayout(cxx_record_decl); - ThunkMap thunk_map(vtable_layout.vtable_thunk_begin(), - vtable_layout.vtable_thunk_end()); + llvm::ArrayRef thunks = + vtable_layout.vtable_thunks(); + ThunkMap thunk_map(thunks.begin(), thunks.end()); abi_util::VTableLayoutIR vtable_ir_layout; uint64_t index = 0; diff --git a/vndk/tools/header-checker/header-abi-dumper/src/ast_processing.cpp b/vndk/tools/header-checker/header-abi-dumper/src/ast_processing.cpp index 9cdc4a6b1..0d8086dd3 100644 --- a/vndk/tools/header-checker/header-abi-dumper/src/ast_processing.cpp +++ b/vndk/tools/header-checker/header-abi-dumper/src/ast_processing.cpp @@ -16,7 +16,7 @@ #include "abi_wrappers.h" #include -#include +#include #include #include diff --git a/vndk/tools/header-checker/header-abi-dumper/src/header_checker.cpp b/vndk/tools/header-checker/header-abi-dumper/src/header_checker.cpp index 751a6c912..c81ca5170 100644 --- a/vndk/tools/header-checker/header-abi-dumper/src/header_checker.cpp +++ b/vndk/tools/header-checker/header-abi-dumper/src/header_checker.cpp @@ -55,8 +55,7 @@ static llvm::cl::opt output_format( "output-format", llvm::cl::desc("Specify format of output dump file"), llvm::cl::values(clEnumValN(abi_util::TextFormatIR::ProtobufTextFormat, "ProtobufTextFormat", "ProtobufTextFormat"), - clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON"), - clEnumValEnd), + clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON")), llvm::cl::init(abi_util::TextFormatIR::Json), llvm::cl::cat(header_checker_category)); @@ -84,14 +83,22 @@ int main(int argc, const char **argv) { // Create compilation database from command line arguments after "--". std::unique_ptr compilations; - { // loadFromCommandLine() may alter argc and argv, thus access fixed_argv // through FixedArgvAccess. FixedArgvAccess raw(fixed_argv); - compilations.reset( + + std::string cmdline_error_msg; + compilations = clang::tooling::FixedCompilationDatabase::loadFromCommandLine( - raw.argc_, raw.argv_)); + raw.argc_, raw.argv_, cmdline_error_msg); + + // Check whether we can create compilation database and deduce compiler + // options from command line options. + if (!compilations) { + llvm::errs() << "ERROR: " << cmdline_error_msg << "\n"; + ::exit(1); + } } // Parse the command line options. @@ -104,13 +111,6 @@ int main(int argc, const char **argv) { ::exit(1); } - // Check whether we can create compilation database and deduce compiler - // options from command line options. - if (!compilations) { - llvm::errs() << "ERROR: Clang compilation options not specified.\n"; - ::exit(1); - } - std::set exported_headers; if (!no_filter) { exported_headers = diff --git a/vndk/tools/header-checker/header-abi-linker/src/header_abi_linker.cpp b/vndk/tools/header-checker/header-abi-linker/src/header_abi_linker.cpp index 85f016cc8..53e7dfaf8 100644 --- a/vndk/tools/header-checker/header-abi-linker/src/header_abi_linker.cpp +++ b/vndk/tools/header-checker/header-abi-linker/src/header_abi_linker.cpp @@ -70,8 +70,7 @@ static llvm::cl::opt input_format( "input-format", llvm::cl::desc("Specify format of input dump files"), llvm::cl::values(clEnumValN(abi_util::TextFormatIR::ProtobufTextFormat, "ProtobufTextFormat", "ProtobufTextFormat"), - clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON"), - clEnumValEnd), + clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON")), llvm::cl::init(abi_util::TextFormatIR::Json), llvm::cl::cat(header_linker_category)); @@ -79,8 +78,7 @@ static llvm::cl::opt output_format( "output-format", llvm::cl::desc("Specify format of output dump file"), llvm::cl::values(clEnumValN(abi_util::TextFormatIR::ProtobufTextFormat, "ProtobufTextFormat", "ProtobufTextFormat"), - clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON"), - clEnumValEnd), + clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON")), llvm::cl::init(abi_util::TextFormatIR::Json), llvm::cl::cat(header_linker_category)); diff --git a/vndk/tools/header-checker/header-abi-util/include/header_abi_util.h b/vndk/tools/header-checker/header-abi-util/include/header_abi_util.h index 5fbc19729..3c7d5eb40 100644 --- a/vndk/tools/header-checker/header-abi-util/include/header_abi_util.h +++ b/vndk/tools/header-checker/header-abi-util/include/header_abi_util.h @@ -30,7 +30,6 @@ using llvm::object::ObjectFile; using llvm::object::ELFObjectFile; using llvm::object::ELFFile; using llvm::object::ELFType; -using llvm::object::ELFDataTypeTypedefHelper; namespace abi_util { diff --git a/vndk/tools/header-checker/header-abi-util/src/collect_exported_headers.cpp b/vndk/tools/header-checker/header-abi-util/src/collect_exported_headers.cpp index afdf76be6..92a2348a4 100644 --- a/vndk/tools/header-checker/header-abi-util/src/collect_exported_headers.cpp +++ b/vndk/tools/header-checker/header-abi-util/src/collect_exported_headers.cpp @@ -51,7 +51,6 @@ bool CollectExportedHeaderSet(const std::string &dir_name, llvm::sys::fs::recursive_directory_iterator walker(dir_name, ec); // Default construction - end of directory. llvm::sys::fs::recursive_directory_iterator end; - llvm::sys::fs::file_status status; for ( ; walker != end; walker.increment(ec)) { if (ec) { llvm::errs() << "Failed to walk dir : " << dir_name << "\n"; @@ -68,14 +67,14 @@ bool CollectExportedHeaderSet(const std::string &dir_name, walker.no_push(); continue; } - - if (walker->status(status)) { + llvm::ErrorOr status = walker->status(); + if (!status) { llvm::errs() << "Failed to stat file : " << file_path << "\n"; return false; } - if ((status.type() != llvm::sys::fs::file_type::symlink_file) && - !llvm::sys::fs::is_regular_file(status)) { + if ((status->type() != llvm::sys::fs::file_type::symlink_file) && + (status->type() != llvm::sys::fs::file_type::regular_file)) { // Ignore non regular files, except symlinks. continue; } diff --git a/vndk/tools/header-checker/proto/Android.bp b/vndk/tools/header-checker/proto/Android.bp index e11f93d49..b63254a8a 100644 --- a/vndk/tools/header-checker/proto/Android.bp +++ b/vndk/tools/header-checker/proto/Android.bp @@ -17,6 +17,8 @@ cc_library_host_static { name: "libheader-checker-proto", + defaults: ["llvm-build-host-tools-defaults"], + srcs: [ "abi_dump.proto", "abi_diff.proto", @@ -28,6 +30,8 @@ cc_library_host_static { canonical_path_from_root: false, }, + shared_libs: ["libc++_host"], + cflags: [ "-Wall", "-Werror", @@ -43,4 +47,7 @@ cc_library_host_static { enabled: false, }, }, + + stl: "none", + compile_multilib: "64", } diff --git a/vndk/tools/header-checker/tests/expected/example1.cpp b/vndk/tools/header-checker/tests/expected/example1.cpp index 5393ca910..810159cbe 100644 --- a/vndk/tools/header-checker/tests/expected/example1.cpp +++ b/vndk/tools/header-checker/tests/expected/example1.cpp @@ -198,12 +198,12 @@ record_types { } record_types { type_info { - name: "Hello::(anonymous)::(anonymous) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5" + name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5" size: 4 alignment: 4 referenced_type: "type-22" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" - linker_set_key: "Hello::(anonymous)::(anonymous) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5" + linker_set_key: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5" self_type: "type-22" } fields { @@ -216,17 +216,17 @@ record_types { is_anonymous: true record_kind: struct_kind tag_info { - unique_id: "Hello::(anonymous)::(anonymous)" + unique_id: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5)" } } record_types { type_info { - name: "Hello::(anonymous) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3" + name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3" size: 12 alignment: 4 referenced_type: "type-21" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" - linker_set_key: "Hello::(anonymous) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3" + linker_set_key: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3" self_type: "type-21" } fields { @@ -251,7 +251,7 @@ record_types { is_anonymous: true record_kind: struct_kind tag_info { - unique_id: "Hello::(anonymous)" + unique_id: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)" } } record_types { @@ -477,11 +477,11 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 10 - name: "Foo_s::foosball" + name: "foosball" } enum_fields { enum_field_value: 11 - name: "Foo_s::foosbat" + name: "foosbat" } access: public_access tag_info { @@ -501,11 +501,11 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 24 - name: "test3::Kind::kind1" + name: "test3::kind1" } enum_fields { enum_field_value: 2312 - name: "test3::Kind::kind2" + name: "test3::kind2" } access: public_access tag_info { @@ -525,7 +525,7 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "CPPHello::Bla::BLA" + name: "CPPHello::BLA" } access: public_access tag_info { diff --git a/vndk/tools/header-checker/tests/expected/example1.h b/vndk/tools/header-checker/tests/expected/example1.h index 5393ca910..810159cbe 100644 --- a/vndk/tools/header-checker/tests/expected/example1.h +++ b/vndk/tools/header-checker/tests/expected/example1.h @@ -198,12 +198,12 @@ record_types { } record_types { type_info { - name: "Hello::(anonymous)::(anonymous) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5" + name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5" size: 4 alignment: 4 referenced_type: "type-22" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" - linker_set_key: "Hello::(anonymous)::(anonymous) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5" + linker_set_key: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5" self_type: "type-22" } fields { @@ -216,17 +216,17 @@ record_types { is_anonymous: true record_kind: struct_kind tag_info { - unique_id: "Hello::(anonymous)::(anonymous)" + unique_id: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5)" } } record_types { type_info { - name: "Hello::(anonymous) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3" + name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3" size: 12 alignment: 4 referenced_type: "type-21" source_file: "/development/vndk/tools/header-checker/tests/input/example1.h" - linker_set_key: "Hello::(anonymous) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3" + linker_set_key: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3" self_type: "type-21" } fields { @@ -251,7 +251,7 @@ record_types { is_anonymous: true record_kind: struct_kind tag_info { - unique_id: "Hello::(anonymous)" + unique_id: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)" } } record_types { @@ -477,11 +477,11 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 10 - name: "Foo_s::foosball" + name: "foosball" } enum_fields { enum_field_value: 11 - name: "Foo_s::foosbat" + name: "foosbat" } access: public_access tag_info { @@ -501,11 +501,11 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 24 - name: "test3::Kind::kind1" + name: "test3::kind1" } enum_fields { enum_field_value: 2312 - name: "test3::Kind::kind2" + name: "test3::kind2" } access: public_access tag_info { @@ -525,7 +525,7 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "CPPHello::Bla::BLA" + name: "CPPHello::BLA" } access: public_access tag_info { diff --git a/vndk/tools/header-checker/tests/expected/example2.h b/vndk/tools/header-checker/tests/expected/example2.h index 8495fef6f..3a46a95fe 100644 --- a/vndk/tools/header-checker/tests/expected/example2.h +++ b/vndk/tools/header-checker/tests/expected/example2.h @@ -209,11 +209,11 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 10 - name: "Foo_s::foosball" + name: "foosball" } enum_fields { enum_field_value: 11 - name: "Foo_s::foosbat" + name: "foosbat" } access: public_access tag_info { @@ -233,11 +233,11 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 24 - name: "test3::Kind::kind1" + name: "test3::kind1" } enum_fields { enum_field_value: 2312 - name: "test3::Kind::kind2" + name: "test3::kind2" } access: public_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp.so.lsdump index fe054b508..bebbf8525 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function.so.lsdump index 485e4d010..7e97fa821 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_global_variable.so.lsdump index 44d2731c5..3a8c08ad4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_global_variable.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_function_access.so.lsdump index bddd5313f..fe06c2351 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_function_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_member_access.so.lsdump index 4c22c87ab..743479fd7 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_member_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_diff.so.lsdump index 09811f10f..e1740a0d3 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_diff.so.lsdump @@ -201,15 +201,15 @@ enum_types { underlying_type: "type-2" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: -1 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_extended.so.lsdump index 9db9a8ce8..35de3897e 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_extended.so.lsdump @@ -201,23 +201,23 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } enum_fields { enum_field_value: 5 - name: "SuperSpeaker::Volume::LouderThanLoudest" + name: "SuperSpeaker::LouderThanLoudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_inheritance_type_changed.so.lsdump index 86d6eaf8d..7ead17ac3 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -261,19 +261,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { 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 82e56b5a1..81603fc92 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 @@ -87,19 +87,19 @@ [ { "enum_field_value" : 1, - "name" : "SuperSpeaker::Volume::Loud" + "name" : "SuperSpeaker::Loud" }, { "enum_field_value" : 2, - "name" : "SuperSpeaker::Volume::Louder" + "name" : "SuperSpeaker::Louder" }, { "enum_field_value" : 3, - "name" : "SuperSpeaker::Volume::Loudest" + "name" : "SuperSpeaker::Loudest" }, { "enum_field_value" : 0, - "name" : "SuperSpeaker::Volume::Lower" + "name" : "SuperSpeaker::Lower" } ], "linker_set_key" : "SuperSpeaker::Volume", diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_cv_diff.so.lsdump index 48a49b2ef..9a032a3a8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_cv_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_diff.so.lsdump index 89b818848..8461951ac 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_fake_diff.so.lsdump index 4ef418c05..f5f3d0bd1 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_fake_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_integral_type_diff.so.lsdump index 486345a5e..5a7b92f54 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-8" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_name_changed.so.lsdump index 84e6472a8..481223cdf 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_name_changed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_parameter_type_diff.so.lsdump index 71320c8c0..1c7097b87 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_parameter_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-5" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_return_type_diff.so.lsdump index 9e6e05de0..e9096e8d9 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_return_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index 2bdd43222..1e93738dc 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_vtable_diff.so.lsdump index 88bf92ed2..e31e37ce4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_vtable_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp.so.lsdump index 13d08a7b0..383ad6126 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function.so.lsdump index cc75e8a89..b5afb3ed5 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_global_variable.so.lsdump index 8dbb4012f..337c3ba9a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_global_variable.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_function_access.so.lsdump index fced35998..849148c21 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_function_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_member_access.so.lsdump index c789c0b64..db365075b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_member_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_diff.so.lsdump index 2b4b5c93d..851585d2a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_diff.so.lsdump @@ -201,15 +201,15 @@ enum_types { underlying_type: "type-2" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: -1 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_extended.so.lsdump index da63f87b5..111190e84 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_extended.so.lsdump @@ -201,23 +201,23 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } enum_fields { enum_field_value: 5 - name: "SuperSpeaker::Volume::LouderThanLoudest" + name: "SuperSpeaker::LouderThanLoudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_inheritance_type_changed.so.lsdump index b8fa8c325..c58d08098 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -261,19 +261,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { 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 f60f7616e..3732e9382 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 @@ -87,19 +87,19 @@ [ { "enum_field_value" : 1, - "name" : "SuperSpeaker::Volume::Loud" + "name" : "SuperSpeaker::Loud" }, { "enum_field_value" : 2, - "name" : "SuperSpeaker::Volume::Louder" + "name" : "SuperSpeaker::Louder" }, { "enum_field_value" : 3, - "name" : "SuperSpeaker::Volume::Loudest" + "name" : "SuperSpeaker::Loudest" }, { "enum_field_value" : 0, - "name" : "SuperSpeaker::Volume::Lower" + "name" : "SuperSpeaker::Lower" } ], "linker_set_key" : "SuperSpeaker::Volume", diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_cv_diff.so.lsdump index a705780cf..a1417ebc2 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_cv_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_diff.so.lsdump index 231572c38..c84fa5b6b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_fake_diff.so.lsdump index 15d62b375..7410dbbff 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_fake_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_integral_type_diff.so.lsdump index 06f99a243..83a799027 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-8" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_name_changed.so.lsdump index 9ca622def..612aba56b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_name_changed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_parameter_type_diff.so.lsdump index 536218161..6165918b0 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_parameter_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-5" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_return_type_diff.so.lsdump index bb7f35f3a..e42c93493 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_return_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index 7b271e601..afcf77d6a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_vtable_diff.so.lsdump index 3755001db..9a1ed4a70 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_vtable_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp.so.lsdump index fe054b508..bebbf8525 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function.so.lsdump index 485e4d010..7e97fa821 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_global_variable.so.lsdump index 44d2731c5..3a8c08ad4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_global_variable.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_function_access.so.lsdump index bddd5313f..fe06c2351 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_function_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_member_access.so.lsdump index 4c22c87ab..743479fd7 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_member_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_diff.so.lsdump index 09811f10f..e1740a0d3 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_diff.so.lsdump @@ -201,15 +201,15 @@ enum_types { underlying_type: "type-2" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: -1 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_extended.so.lsdump index 9db9a8ce8..35de3897e 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_extended.so.lsdump @@ -201,23 +201,23 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } enum_fields { enum_field_value: 5 - name: "SuperSpeaker::Volume::LouderThanLoudest" + name: "SuperSpeaker::LouderThanLoudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_inheritance_type_changed.so.lsdump index 86d6eaf8d..7ead17ac3 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -261,19 +261,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump index 82e56b5a1..81603fc92 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump @@ -87,19 +87,19 @@ [ { "enum_field_value" : 1, - "name" : "SuperSpeaker::Volume::Loud" + "name" : "SuperSpeaker::Loud" }, { "enum_field_value" : 2, - "name" : "SuperSpeaker::Volume::Louder" + "name" : "SuperSpeaker::Louder" }, { "enum_field_value" : 3, - "name" : "SuperSpeaker::Volume::Loudest" + "name" : "SuperSpeaker::Loudest" }, { "enum_field_value" : 0, - "name" : "SuperSpeaker::Volume::Lower" + "name" : "SuperSpeaker::Lower" } ], "linker_set_key" : "SuperSpeaker::Volume", diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_cv_diff.so.lsdump index 48a49b2ef..9a032a3a8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_cv_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_diff.so.lsdump index 89b818848..8461951ac 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_fake_diff.so.lsdump index 4ef418c05..f5f3d0bd1 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_fake_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_integral_type_diff.so.lsdump index 486345a5e..5a7b92f54 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-8" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_name_changed.so.lsdump index 84e6472a8..481223cdf 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_name_changed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_parameter_type_diff.so.lsdump index 71320c8c0..1c7097b87 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_parameter_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-5" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_return_type_diff.so.lsdump index 9e6e05de0..e9096e8d9 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_return_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index 2bdd43222..1e93738dc 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_vtable_diff.so.lsdump index 88bf92ed2..e31e37ce4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_vtable_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp.so.lsdump index 13d08a7b0..383ad6126 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function.so.lsdump index cc75e8a89..b5afb3ed5 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_function.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_global_variable.so.lsdump index 8dbb4012f..337c3ba9a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_add_global_variable.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_function_access.so.lsdump index fced35998..849148c21 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_function_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_member_access.so.lsdump index c789c0b64..db365075b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_change_member_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_diff.so.lsdump index 2b4b5c93d..851585d2a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_diff.so.lsdump @@ -201,15 +201,15 @@ enum_types { underlying_type: "type-2" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: -1 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_extended.so.lsdump index da63f87b5..111190e84 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_enum_extended.so.lsdump @@ -201,23 +201,23 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } enum_fields { enum_field_value: 5 - name: "SuperSpeaker::Volume::LouderThanLoudest" + name: "SuperSpeaker::LouderThanLoudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_inheritance_type_changed.so.lsdump index b8fa8c325..c58d08098 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -261,19 +261,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_json.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_json.so.lsdump index f60f7616e..3732e9382 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_json.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_json.so.lsdump @@ -87,19 +87,19 @@ [ { "enum_field_value" : 1, - "name" : "SuperSpeaker::Volume::Loud" + "name" : "SuperSpeaker::Loud" }, { "enum_field_value" : 2, - "name" : "SuperSpeaker::Volume::Louder" + "name" : "SuperSpeaker::Louder" }, { "enum_field_value" : 3, - "name" : "SuperSpeaker::Volume::Loudest" + "name" : "SuperSpeaker::Loudest" }, { "enum_field_value" : 0, - "name" : "SuperSpeaker::Volume::Lower" + "name" : "SuperSpeaker::Lower" } ], "linker_set_key" : "SuperSpeaker::Volume", diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_cv_diff.so.lsdump index a705780cf..a1417ebc2 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_cv_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_diff.so.lsdump index 231572c38..c84fa5b6b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_fake_diff.so.lsdump index 15d62b375..7410dbbff 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_fake_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_integral_type_diff.so.lsdump index 06f99a243..83a799027 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-8" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_name_changed.so.lsdump index 9ca622def..612aba56b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_member_name_changed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_parameter_type_diff.so.lsdump index 536218161..6165918b0 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_parameter_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-5" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_return_type_diff.so.lsdump index bb7f35f3a..e42c93493 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_return_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index 7b271e601..afcf77d6a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_vtable_diff.so.lsdump index 3755001db..9a1ed4a70 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libgolden_cpp_vtable_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp.so.lsdump index fe054b508..bebbf8525 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function.so.lsdump index 485e4d010..7e97fa821 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_function.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_global_variable.so.lsdump index 44d2731c5..3a8c08ad4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_add_global_variable.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_function_access.so.lsdump index bddd5313f..fe06c2351 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_function_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_member_access.so.lsdump index 4c22c87ab..743479fd7 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_change_member_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_diff.so.lsdump index 09811f10f..e1740a0d3 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_diff.so.lsdump @@ -201,15 +201,15 @@ enum_types { underlying_type: "type-2" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: -1 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_extended.so.lsdump index 9db9a8ce8..35de3897e 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_enum_extended.so.lsdump @@ -201,23 +201,23 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } enum_fields { enum_field_value: 5 - name: "SuperSpeaker::Volume::LouderThanLoudest" + name: "SuperSpeaker::LouderThanLoudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_inheritance_type_changed.so.lsdump index 86d6eaf8d..7ead17ac3 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -261,19 +261,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { 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 82e56b5a1..81603fc92 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 @@ -87,19 +87,19 @@ [ { "enum_field_value" : 1, - "name" : "SuperSpeaker::Volume::Loud" + "name" : "SuperSpeaker::Loud" }, { "enum_field_value" : 2, - "name" : "SuperSpeaker::Volume::Louder" + "name" : "SuperSpeaker::Louder" }, { "enum_field_value" : 3, - "name" : "SuperSpeaker::Volume::Loudest" + "name" : "SuperSpeaker::Loudest" }, { "enum_field_value" : 0, - "name" : "SuperSpeaker::Volume::Lower" + "name" : "SuperSpeaker::Lower" } ], "linker_set_key" : "SuperSpeaker::Volume", diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_cv_diff.so.lsdump index 48a49b2ef..9a032a3a8 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_cv_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_diff.so.lsdump index 91f9236e2..643f22a84 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_fake_diff.so.lsdump index 4ef418c05..f5f3d0bd1 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_fake_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_integral_type_diff.so.lsdump index 486345a5e..5a7b92f54 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-8" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_name_changed.so.lsdump index 84e6472a8..481223cdf 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_member_name_changed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_parameter_type_diff.so.lsdump index 71320c8c0..1c7097b87 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_parameter_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-5" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_return_type_diff.so.lsdump index 9e6e05de0..e9096e8d9 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_return_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index 2bdd43222..1e93738dc 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_vtable_diff.so.lsdump index 88bf92ed2..e31e37ce4 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86/libgolden_cpp_vtable_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp.so.lsdump index 13d08a7b0..383ad6126 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function.so.lsdump index cc75e8a89..b5afb3ed5 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_function.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_global_variable.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_global_variable.so.lsdump index 8dbb4012f..337c3ba9a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_global_variable.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_add_global_variable.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_function_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_function_access.so.lsdump index fced35998..849148c21 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_function_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_function_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_member_access.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_member_access.so.lsdump index c789c0b64..db365075b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_member_access.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_change_member_access.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_diff.so.lsdump index 2b4b5c93d..851585d2a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_diff.so.lsdump @@ -201,15 +201,15 @@ enum_types { underlying_type: "type-2" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: -1 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_extended.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_extended.so.lsdump index da63f87b5..111190e84 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_extended.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_enum_extended.so.lsdump @@ -201,23 +201,23 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } enum_fields { enum_field_value: 5 - name: "SuperSpeaker::Volume::LouderThanLoudest" + name: "SuperSpeaker::LouderThanLoudest" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_inheritance_type_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_inheritance_type_changed.so.lsdump index b8fa8c325..c58d08098 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_inheritance_type_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_inheritance_type_changed.so.lsdump @@ -261,19 +261,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { 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 f60f7616e..3732e9382 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 @@ -87,19 +87,19 @@ [ { "enum_field_value" : 1, - "name" : "SuperSpeaker::Volume::Loud" + "name" : "SuperSpeaker::Loud" }, { "enum_field_value" : 2, - "name" : "SuperSpeaker::Volume::Louder" + "name" : "SuperSpeaker::Louder" }, { "enum_field_value" : 3, - "name" : "SuperSpeaker::Volume::Loudest" + "name" : "SuperSpeaker::Loudest" }, { "enum_field_value" : 0, - "name" : "SuperSpeaker::Volume::Lower" + "name" : "SuperSpeaker::Lower" } ], "linker_set_key" : "SuperSpeaker::Volume", diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_cv_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_cv_diff.so.lsdump index a705780cf..a1417ebc2 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_cv_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_cv_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_diff.so.lsdump index 231572c38..c84fa5b6b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_fake_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_fake_diff.so.lsdump index 15d62b375..7410dbbff 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_fake_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_fake_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-9" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_integral_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_integral_type_diff.so.lsdump index 06f99a243..83a799027 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_integral_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_integral_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-8" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_name_changed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_name_changed.so.lsdump index 9ca622def..612aba56b 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_name_changed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_member_name_changed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_parameter_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_parameter_type_diff.so.lsdump index 536218161..6165918b0 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_parameter_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_parameter_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-5" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_return_type_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_return_type_diff.so.lsdump index bb7f35f3a..e42c93493 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_return_type_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_return_type_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump index 7b271e601..afcf77d6a 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info { diff --git a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_vtable_diff.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_vtable_diff.so.lsdump index 3755001db..9a1ed4a70 100644 --- a/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_vtable_diff.so.lsdump +++ b/vndk/tools/header-checker/tests/reference_dumps/x86_64/libgolden_cpp_vtable_diff.so.lsdump @@ -201,19 +201,19 @@ enum_types { underlying_type: "type-6" enum_fields { enum_field_value: 1 - name: "SuperSpeaker::Volume::Loud" + name: "SuperSpeaker::Loud" } enum_fields { enum_field_value: 2 - name: "SuperSpeaker::Volume::Louder" + name: "SuperSpeaker::Louder" } enum_fields { enum_field_value: 3 - name: "SuperSpeaker::Volume::Loudest" + name: "SuperSpeaker::Loudest" } enum_fields { enum_field_value: 0 - name: "SuperSpeaker::Volume::Lower" + name: "SuperSpeaker::Lower" } access: private_access tag_info {