Merge "Add path to module"
diff --git a/tools/core_connectivity/check_style.sh b/tools/core_connectivity/check_style.sh
new file mode 100755
index 0000000..29614e0
--- /dev/null
+++ b/tools/core_connectivity/check_style.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+#VERSION=1
+
+SELFNAME=$0
+
+function getAbsolutePath() {
+ readlink -e $1
+}
+
+function printUsage() {
+ echo " $SELFNAME check coding style for HEAD in this git"
+ echo " $SELFNAME -h show this message"
+}
+
+function main() {
+ test "$1" == "-h" && printUsage && exit
+ test "$ANDROID_BUILD_TOP" == "" && echo "please run env setup" && exit
+ GITROOTDIR=`git rev-parse --show-toplevel`
+ test "$GITROOTDIR" == "" && echo "not inside a git repository" && exit
+ MODIFIED=`git status -s --untracked-files=no | wc -l`
+ test $MODIFIED -ne 0 && echo "please commit first" && exit
+
+ cd $GITROOTDIR
+
+ #basic check
+ local PARAMS=" --config_xml $ANDROID_BUILD_TOP/prebuilts/checkstyle/android-style.xml"
+ $ANDROID_BUILD_TOP/prebuilts/checkstyle/checkstyle.py $PARAMS
+
+ #commit message equal or less then 65 char for each line (suggested by lorenzo@20180625)
+ local MSG=`git rev-list --format=%B --max-count=1 HEAD`
+ local i=1
+ while read -r line; do
+ test `echo $line | wc -c` -gt 65 && echo "FAILED: Line $i exceed 65 chars limit: $line"
+ i=$((i+1))
+ done < <(echo "$MSG")
+
+ cd -
+}
+
+main $*
diff --git a/vndk/tools/header-checker/Android.bp b/vndk/tools/header-checker/Android.bp
index 979c2ff..0cbc559 100644
--- a/vndk/tools/header-checker/Android.bp
+++ b/vndk/tools/header-checker/Android.bp
@@ -18,17 +18,20 @@
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 @@
enabled: false,
},
},
+
+ compile_multilib: "64",
+ stl: "none",
}
cc_binary_host {
@@ -61,54 +67,32 @@
"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 @@
],
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 b801adb..b36e5ac 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<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"),
- 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 @@
"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<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"),
- 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 ef0aecf..9181965 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 <limits.h>
#include <stdlib.h>
-#include <clang/Tooling/Core/QualTypeNames.h>
+#include <clang/AST/QualTypeNames.h>
#include <clang/Index/CodegenNameGenerator.h>
#include <string>
@@ -422,7 +422,8 @@
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 @@
}
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<clang::VTableLayout::VTableThunkTy> 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 9cdc4a6..0d8086d 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 <clang/Lex/Token.h>
-#include <clang/Tooling/Core/QualTypeNames.h>
+#include <clang/AST/QualTypeNames.h>
#include <clang/Index/CodegenNameGenerator.h>
#include <fstream>
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 751a6c9..c81ca51 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 @@
"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 @@
// 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);
- 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 @@
::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 =
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 85f016c..53e7dfa 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 @@
"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 @@
"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 5fbc197..3c7d5eb 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::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 afdf76b..92a2348 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 @@
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 @@
walker.no_push();
continue;
}
-
- if (walker->status(status)) {
+ llvm::ErrorOr<llvm::sys::fs::basic_file_status> 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 e11f93d..b63254a 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 @@
canonical_path_from_root: false,
},
+ shared_libs: ["libc++_host"],
+
cflags: [
"-Wall",
"-Werror",
@@ -43,4 +47,7 @@
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 5393ca9..810159c 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 {
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 @@
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 @@
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 @@
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 @@
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 @@
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 5393ca9..810159c 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 {
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 @@
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 @@
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 @@
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 @@
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 @@
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 8495fef..3a46a95 100644
--- a/vndk/tools/header-checker/tests/expected/example2.h
+++ b/vndk/tools/header-checker/tests/expected/example2.h
@@ -209,11 +209,11 @@
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 @@
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 fe054b5..bebbf85 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 @@
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 485e4d0..7e97fa8 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 @@
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 44d2731..3a8c08a 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 @@
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 bddd531..fe06c23 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 @@
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 4c22c87..743479f 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 @@
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 09811f1..e1740a0 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 @@
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 9db9a8c..35de389 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 @@
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 86d6eaf8..7ead17a 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 @@
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 82e56b5..81603fc 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 48a49b2..9a032a3 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 @@
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 89b8188..8461951 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 @@
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 4ef418c..f5f3d0b 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 @@
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 486345a..5a7b92f 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 @@
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 84e6472..481223c 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 @@
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 71320c8..1c7097b 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 @@
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 9e6e05d..e9096e8 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 @@
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 2bdd432..1e93738 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 @@
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 88bf92e..e31e37c 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 @@
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 13d08a7..383ad61 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 @@
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 cc75e8a..b5afb3e 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 @@
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 8dbb401..337c3ba 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 @@
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 fced359..849148c 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 @@
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 c789c0b..db36507 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 @@
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 2b4b5c9..851585d 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 @@
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 da63f87..111190e 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 @@
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 b8fa8c3..c58d080 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 @@
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 f60f761..3732e93 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 a705780..a1417eb 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 @@
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 231572c..c84fa5b 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 @@
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 15d62b3..7410dbb 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 @@
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 06f99a2..83a7990 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 @@
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 9ca622d..612aba5 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 @@
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 5362181..6165918 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 @@
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 bb7f35f..e42c934 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 @@
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 7b271e6..afcf77d 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 @@
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 3755001..9a1ed4a 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 @@
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 fe054b5..bebbf85 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 @@
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 485e4d0..7e97fa8 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 @@
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 44d2731..3a8c08a 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 @@
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 bddd531..fe06c23 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 @@
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 4c22c87..743479f 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 @@
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 09811f1..e1740a0 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 @@
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 9db9a8c..35de389 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 @@
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 86d6eaf8..7ead17a 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 @@
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 82e56b5..81603fc 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 48a49b2..9a032a3 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 @@
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 89b8188..8461951 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 @@
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 4ef418c..f5f3d0b 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 @@
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 486345a..5a7b92f 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 @@
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 84e6472..481223c 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 @@
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 71320c8..1c7097b 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 @@
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 9e6e05d..e9096e8 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 @@
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 2bdd432..1e93738 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 @@
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 88bf92e..e31e37c 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 @@
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 13d08a7..383ad61 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 @@
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 cc75e8a..b5afb3e 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 @@
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 8dbb401..337c3ba 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 @@
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 fced359..849148c 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 @@
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 c789c0b..db36507 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 @@
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 2b4b5c9..851585d 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 @@
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 da63f87..111190e 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 @@
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 b8fa8c3..c58d080 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 @@
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 f60f761..3732e93 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 a705780..a1417eb 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 @@
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 231572c..c84fa5b 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 @@
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 15d62b3..7410dbb 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 @@
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 06f99a2..83a7990 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 @@
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 9ca622d..612aba5 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 @@
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 5362181..6165918 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 @@
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 bb7f35f..e42c934 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 @@
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 7b271e6..afcf77d 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 @@
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 3755001..9a1ed4a 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 @@
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 fe054b5..bebbf85 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 @@
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 485e4d0..7e97fa8 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 @@
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 44d2731..3a8c08a 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 @@
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 bddd531..fe06c23 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 @@
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 4c22c87..743479f 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 @@
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 09811f1..e1740a0 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 @@
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 9db9a8c..35de389 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 @@
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 86d6eaf8..7ead17a 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 @@
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 82e56b5..81603fc 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 48a49b2..9a032a3 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 @@
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 91f9236..643f22a 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 @@
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 4ef418c..f5f3d0b 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 @@
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 486345a..5a7b92f 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 @@
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 84e6472..481223c 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 @@
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 71320c8..1c7097b 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 @@
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 9e6e05d..e9096e8 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 @@
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 2bdd432..1e93738 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 @@
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 88bf92e..e31e37c 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 @@
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 13d08a7..383ad61 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 @@
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 cc75e8a..b5afb3e 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 @@
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 8dbb401..337c3ba 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 @@
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 fced359..849148c 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 @@
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 c789c0b..db36507 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 @@
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 2b4b5c9..851585d 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 @@
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 da63f87..111190e 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 @@
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 b8fa8c3..c58d080 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 @@
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 f60f761..3732e93 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 a705780..a1417eb 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 @@
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 231572c..c84fa5b 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 @@
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 15d62b3..7410dbb 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 @@
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 06f99a2..83a7990 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 @@
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 9ca622d..612aba5 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 @@
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 5362181..6165918 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 @@
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 bb7f35f..e42c934 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 @@
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 7b271e6..afcf77d 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 @@
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 3755001..9a1ed4a 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 @@
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 {
