Merge "Revert "Build header-abi-dumper with clang-r339409b""

vndk/tools/header-checker/Android.bp

@@ -18,20 +18,17 @@ cc_defaults {
     name: "header-checker-defaults",
 
     defaults: [
-        "llvm-build-host-tools-defaults",
+        "clang-defaults",
     ],
 
     cflags: [
         "-Wall",
         "-Werror",
-        "-Wno-unused-parameter",
         "-DGOOGLE_PROTOBUF_NO_RTTI",
         "-UNDEBUG",
     ],
 
     cppflags: [
-        "-fno-exceptions",
-        "-fno-rtti",
         "-std=c++14",
     ],
 
@@ -40,9 +37,6 @@ cc_defaults {
             enabled: false,
         },
     },
-
-    compile_multilib: "64",
-    stl: "none",
 }
 
 cc_binary_host {
@@ -67,32 +61,54 @@ 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",
     ],
 }
 
@@ -160,8 +176,6 @@ cc_library_host_static {
     ],
 
     shared_libs: [
-        "libLLVM_host",
-        "libc++_host",
         "libprotobuf-cpp-full",
     ],
 

vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp

@@ -87,15 +87,17 @@ static llvm::cl::opt<bool> allow_unreferenced_changes(
 
 static llvm::cl::opt<bool> 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<abi_util::TextFormatIR> 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")),
+                     clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON"),
+                     clEnumValEnd),
     llvm::cl::init(abi_util::TextFormatIR::Json),
     llvm::cl::cat(header_checker_category));
 
@@ -103,14 +105,16 @@ static llvm::cl::opt<abi_util::TextFormatIR> 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")),
+                     clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON"),
+                     clEnumValEnd),
     llvm::cl::init(abi_util::TextFormatIR::Json),
     llvm::cl::cat(header_checker_category));
 
 static llvm::cl::opt<abi_util::TextFormatIR> 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")),
+                                "ProtobufTextFormat", "ProtobufTextFormat"),
+                     clEnumValEnd),
     llvm::cl::init(abi_util::TextFormatIR::ProtobufTextFormat),
     llvm::cl::cat(header_checker_category));
 

vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp

@@ -18,7 +18,7 @@
 
 #include <limits.h>
 #include <stdlib.h>
-#include <clang/AST/QualTypeNames.h>
+#include <clang/Tooling/Core/QualTypeNames.h>
 #include <clang/Index/CodegenNameGenerator.h>
 
 #include <string>
@@ -422,8 +422,7 @@ std::string ABIWrapper::QualTypeToString(
   if (salty_qt.getTypePtr()->isDependentType()) {
     return salty_qt.getAsString();
   }
-  return clang::TypeName::getFullyQualifiedName(
-      salty_qt, *ast_contextp_, ast_contextp_->getPrintingPolicy());
+  return clang::TypeName::getFullyQualifiedName(salty_qt, *ast_contextp_);
 }
 
 FunctionTypeWrapper::FunctionTypeWrapper(
@@ -657,9 +656,8 @@ bool RecordDeclWrapper::SetupRecordVTable(
   }
   const clang::VTableLayout &vtable_layout =
       itanium_vtable_contextp->getVTableLayout(cxx_record_decl);
-  llvm::ArrayRef<clang::VTableLayout::VTableThunkTy> thunks =
-      vtable_layout.vtable_thunks();
-  ThunkMap thunk_map(thunks.begin(), thunks.end());
+  ThunkMap thunk_map(vtable_layout.vtable_thunk_begin(),
+                     vtable_layout.vtable_thunk_end());
   abi_util::VTableLayoutIR vtable_ir_layout;
 
   uint64_t index = 0;

vndk/tools/header-checker/header-abi-dumper/src/ast_processing.cpp

@@ -16,7 +16,7 @@
 #include "abi_wrappers.h"
 
 #include <clang/Lex/Token.h>
-#include <clang/AST/QualTypeNames.h>
+#include <clang/Tooling/Core/QualTypeNames.h>
 #include <clang/Index/CodegenNameGenerator.h>
 
 #include <fstream>

vndk/tools/header-checker/header-abi-dumper/src/header_checker.cpp

@@ -55,7 +55,8 @@ static llvm::cl::opt<abi_util::TextFormatIR> 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")),
+                     clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON"),
+                     clEnumValEnd),
     llvm::cl::init(abi_util::TextFormatIR::Json),
     llvm::cl::cat(header_checker_category));
 
@@ -83,22 +84,14 @@ int main(int argc, const char **argv) {
 
   // Create compilation database from command line arguments after "--".
   std::unique_ptr<clang::tooling::CompilationDatabase> compilations;
+
   {
     // loadFromCommandLine() may alter argc and argv, thus access fixed_argv
     // through FixedArgvAccess.
     FixedArgvAccess raw(fixed_argv);
-
-    std::string cmdline_error_msg;
-    compilations =
+    compilations.reset(
         clang::tooling::FixedCompilationDatabase::loadFromCommandLine(
-            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);
-    }
+            raw.argc_, raw.argv_));
   }
 
   // Parse the command line options.
@@ -111,6 +104,13 @@ 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<std::string> exported_headers;
   if (!no_filter) {
     exported_headers =

vndk/tools/header-checker/header-abi-linker/src/header_abi_linker.cpp

@@ -70,7 +70,8 @@ static llvm::cl::opt<abi_util::TextFormatIR> 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")),
+                     clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON"),
+                     clEnumValEnd),
     llvm::cl::init(abi_util::TextFormatIR::Json),
     llvm::cl::cat(header_linker_category));
 
@@ -78,7 +79,8 @@ static llvm::cl::opt<abi_util::TextFormatIR> 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")),
+                     clEnumValN(abi_util::TextFormatIR::Json, "Json", "JSON"),
+                     clEnumValEnd),
     llvm::cl::init(abi_util::TextFormatIR::Json),
     llvm::cl::cat(header_linker_category));
 

vndk/tools/header-checker/header-abi-util/include/header_abi_util.h

@@ -30,6 +30,7 @@ using llvm::object::ObjectFile;
 using llvm::object::ELFObjectFile;
 using llvm::object::ELFFile;
 using llvm::object::ELFType;
+using llvm::object::ELFDataTypeTypedefHelper;
 
 namespace abi_util {
 

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

@@ -51,6 +51,7 @@ 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";
@@ -67,14 +68,14 @@ bool CollectExportedHeaderSet(const std::string &dir_name,
       walker.no_push();
       continue;
     }
-    llvm::ErrorOr<llvm::sys::fs::basic_file_status> status =  walker->status();
-    if (!status) {
+
+    if (walker->status(status)) {
       llvm::errs() << "Failed to stat file : " << file_path << "\n";
       return false;
     }
 
-    if ((status->type() != llvm::sys::fs::file_type::symlink_file) &&
-        (status->type() != llvm::sys::fs::file_type::regular_file)) {
+    if ((status.type() != llvm::sys::fs::file_type::symlink_file) &&
+        !llvm::sys::fs::is_regular_file(status)) {
       // Ignore non regular files, except symlinks.
       continue;
     }

vndk/tools/header-checker/proto/Android.bp

@@ -17,8 +17,6 @@
 cc_library_host_static {
     name: "libheader-checker-proto",
 
-    defaults: ["llvm-build-host-tools-defaults"],
-
     srcs: [
         "abi_dump.proto",
         "abi_diff.proto",
@@ -30,8 +28,6 @@ cc_library_host_static {
         canonical_path_from_root: false,
     },
 
-    shared_libs: ["libc++_host"],
-
     cflags: [
         "-Wall",
         "-Werror",
@@ -47,7 +43,4 @@ cc_library_host_static {
             enabled: false,
         },
     },
-
-    stl: "none",
-    compile_multilib: "64",
 }

vndk/tools/header-checker/tests/expected/example1.cpp

@@ -198,12 +198,12 @@ record_types {
 }
 record_types {
   type_info {
-    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"
+    name: "Hello::(anonymous)::(anonymous) 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 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"
+    linker_set_key: "Hello::(anonymous)::(anonymous) 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 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)"
+    unique_id: "Hello::(anonymous)::(anonymous)"
   }
 }
 record_types {
   type_info {
-    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"
+    name: "Hello::(anonymous) 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 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"
+    linker_set_key: "Hello::(anonymous) 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 struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)"
+    unique_id: "Hello::(anonymous)"
   }
 }
 record_types {
@@ -477,11 +477,11 @@ enum_types {
   underlying_type: "type-9"
   enum_fields {
     enum_field_value: 10
-    name: "foosball"
+    name: "Foo_s::foosball"
   }
   enum_fields {
     enum_field_value: 11
-    name: "foosbat"
+    name: "Foo_s::foosbat"
   }
   access: public_access
   tag_info {
@@ -501,11 +501,11 @@ enum_types {
   underlying_type: "type-9"
   enum_fields {
     enum_field_value: 24
-    name: "test3::kind1"
+    name: "test3::Kind::kind1"
   }
   enum_fields {
     enum_field_value: 2312
-    name: "test3::kind2"
+    name: "test3::Kind::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"
+    name: "CPPHello::Bla::BLA"
   }
   access: public_access
   tag_info {

vndk/tools/header-checker/tests/expected/example1.h

@@ -198,12 +198,12 @@ record_types {
 }
 record_types {
   type_info {
-    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"
+    name: "Hello::(anonymous)::(anonymous) 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 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"
+    linker_set_key: "Hello::(anonymous)::(anonymous) 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 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)"
+    unique_id: "Hello::(anonymous)::(anonymous)"
   }
 }
 record_types {
   type_info {
-    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"
+    name: "Hello::(anonymous) 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 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"
+    linker_set_key: "Hello::(anonymous) 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 struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)"
+    unique_id: "Hello::(anonymous)"
   }
 }
 record_types {
@@ -477,11 +477,11 @@ enum_types {
   underlying_type: "type-9"
   enum_fields {
     enum_field_value: 10
-    name: "foosball"
+    name: "Foo_s::foosball"
   }
   enum_fields {
     enum_field_value: 11
-    name: "foosbat"
+    name: "Foo_s::foosbat"
   }
   access: public_access
   tag_info {
@@ -501,11 +501,11 @@ enum_types {
   underlying_type: "type-9"
   enum_fields {
     enum_field_value: 24
-    name: "test3::kind1"
+    name: "test3::Kind::kind1"
   }
   enum_fields {
     enum_field_value: 2312
-    name: "test3::kind2"
+    name: "test3::Kind::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"
+    name: "CPPHello::Bla::BLA"
   }
   access: public_access
   tag_info {

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: "foosball"
+    name: "Foo_s::foosball"
   }
   enum_fields {
     enum_field_value: 11
-    name: "foosbat"
+    name: "Foo_s::foosbat"
   }
   access: public_access
   tag_info {
@@ -233,11 +233,11 @@ enum_types {
   underlying_type: "type-9"
   enum_fields {
     enum_field_value: 24
-    name: "test3::kind1"
+    name: "test3::Kind::kind1"
   }
   enum_fields {
     enum_field_value: 2312
-    name: "test3::kind2"
+    name: "test3::Kind::kind2"
   }
   access: public_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: -1
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   enum_fields {
     enum_field_value: 5
-    name: "SuperSpeaker::LouderThanLoudest"
+    name: "SuperSpeaker::Volume::LouderThanLoudest"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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

@@ -87,19 +87,19 @@
    [
     {
      "enum_field_value" : 1,
-     "name" : "SuperSpeaker::Loud"
+     "name" : "SuperSpeaker::Volume::Loud"
     },
     {
      "enum_field_value" : 2,
-     "name" : "SuperSpeaker::Louder"
+     "name" : "SuperSpeaker::Volume::Louder"
     },
     {
      "enum_field_value" : 3,
-     "name" : "SuperSpeaker::Loudest"
+     "name" : "SuperSpeaker::Volume::Loudest"
     },
     {
      "enum_field_value" : 0,
-     "name" : "SuperSpeaker::Lower"
+     "name" : "SuperSpeaker::Volume::Lower"
     }
    ],
    "linker_set_key" : "SuperSpeaker::Volume",

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: -1
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   enum_fields {
     enum_field_value: 5
-    name: "SuperSpeaker::LouderThanLoudest"
+    name: "SuperSpeaker::Volume::LouderThanLoudest"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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

@@ -87,19 +87,19 @@
    [
     {
      "enum_field_value" : 1,
-     "name" : "SuperSpeaker::Loud"
+     "name" : "SuperSpeaker::Volume::Loud"
     },
     {
      "enum_field_value" : 2,
-     "name" : "SuperSpeaker::Louder"
+     "name" : "SuperSpeaker::Volume::Louder"
     },
     {
      "enum_field_value" : 3,
-     "name" : "SuperSpeaker::Loudest"
+     "name" : "SuperSpeaker::Volume::Loudest"
     },
     {
      "enum_field_value" : 0,
-     "name" : "SuperSpeaker::Lower"
+     "name" : "SuperSpeaker::Volume::Lower"
     }
    ],
    "linker_set_key" : "SuperSpeaker::Volume",

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: -1
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   enum_fields {
     enum_field_value: 5
-    name: "SuperSpeaker::LouderThanLoudest"
+    name: "SuperSpeaker::Volume::LouderThanLoudest"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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

@@ -87,19 +87,19 @@
    [
     {
      "enum_field_value" : 1,
-     "name" : "SuperSpeaker::Loud"
+     "name" : "SuperSpeaker::Volume::Loud"
     },
     {
      "enum_field_value" : 2,
-     "name" : "SuperSpeaker::Louder"
+     "name" : "SuperSpeaker::Volume::Louder"
     },
     {
      "enum_field_value" : 3,
-     "name" : "SuperSpeaker::Loudest"
+     "name" : "SuperSpeaker::Volume::Loudest"
     },
     {
      "enum_field_value" : 0,
-     "name" : "SuperSpeaker::Lower"
+     "name" : "SuperSpeaker::Volume::Lower"
     }
    ],
    "linker_set_key" : "SuperSpeaker::Volume",

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: -1
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   enum_fields {
     enum_field_value: 5
-    name: "SuperSpeaker::LouderThanLoudest"
+    name: "SuperSpeaker::Volume::LouderThanLoudest"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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

@@ -87,19 +87,19 @@
    [
     {
      "enum_field_value" : 1,
-     "name" : "SuperSpeaker::Loud"
+     "name" : "SuperSpeaker::Volume::Loud"
     },
     {
      "enum_field_value" : 2,
-     "name" : "SuperSpeaker::Louder"
+     "name" : "SuperSpeaker::Volume::Louder"
     },
     {
      "enum_field_value" : 3,
-     "name" : "SuperSpeaker::Loudest"
+     "name" : "SuperSpeaker::Volume::Loudest"
     },
     {
      "enum_field_value" : 0,
-     "name" : "SuperSpeaker::Lower"
+     "name" : "SuperSpeaker::Volume::Lower"
     }
    ],
    "linker_set_key" : "SuperSpeaker::Volume",

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: -1
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   enum_fields {
     enum_field_value: 5
-    name: "SuperSpeaker::LouderThanLoudest"
+    name: "SuperSpeaker::Volume::LouderThanLoudest"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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

@@ -87,19 +87,19 @@
    [
     {
      "enum_field_value" : 1,
-     "name" : "SuperSpeaker::Loud"
+     "name" : "SuperSpeaker::Volume::Loud"
     },
     {
      "enum_field_value" : 2,
-     "name" : "SuperSpeaker::Louder"
+     "name" : "SuperSpeaker::Volume::Louder"
     },
     {
      "enum_field_value" : 3,
-     "name" : "SuperSpeaker::Loudest"
+     "name" : "SuperSpeaker::Volume::Loudest"
     },
     {
      "enum_field_value" : 0,
-     "name" : "SuperSpeaker::Lower"
+     "name" : "SuperSpeaker::Volume::Lower"
     }
    ],
    "linker_set_key" : "SuperSpeaker::Volume",

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {

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::Loud"
+    name: "SuperSpeaker::Volume::Loud"
   }
   enum_fields {
     enum_field_value: 2
-    name: "SuperSpeaker::Louder"
+    name: "SuperSpeaker::Volume::Louder"
   }
   enum_fields {
     enum_field_value: 3
-    name: "SuperSpeaker::Loudest"
+    name: "SuperSpeaker::Volume::Loudest"
   }
   enum_fields {
     enum_field_value: 0
-    name: "SuperSpeaker::Lower"
+    name: "SuperSpeaker::Volume::Lower"
   }
   access: private_access
   tag_info {