Merge "Do not omit enum_field_value in JSON dumps"

2018-09-27 08:35:20 +00:00
parent bed6b4feb9 bee93e1099
commit 66d95e1ce4
104 changed files with 106 additions and 105 deletions
--- a/vndk/tools/header-checker/header-abi-util/src/ir_representation_json.cpp
+++ b/vndk/tools/header-checker/header-abi-util/src/ir_representation_json.cpp
@@ -295,7 +295,8 @@ JsonObject IRToJsonConverter::ConvertFunctionIR(const FunctionIR *functionp) {
 static JsonObject ConvertEnumFieldIR(const EnumFieldIR *enum_field_ir) {
  JsonObject enum_field;
  enum_field.Set("name", enum_field_ir->GetName());
-  enum_field.Set("enum_field_value", (int64_t)enum_field_ir->GetValue());
+  // Never omit enum values.
+  enum_field["enum_field_value"] = Json::Int64(enum_field_ir->GetValue());
  return enum_field;
 }

--- a/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h
+++ b/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h
@@ -25,7 +25,7 @@
 #if GOLDEN_ENUM_EXTENSION
 #define LOUD_SUPERLATIVES \
    Loudest = 3, \
-    Lower = 4,\
+    Lower = 0,\
    LouderThanLoudest = 5
 #elif GOLDEN_ENUM_DIFF
 #define LOUD_SUPERLATIVES \
@@ -33,7 +33,7 @@
 #else
 #define LOUD_SUPERLATIVES \
    Loudest = 3, \
-    Lower = 4
+    Lower = 0
 #endif

 class SuperSpeaker {
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  enum_fields {
--- 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
@@ -272,7 +272,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -98,7 +98,7 @@
     "name" : "SuperSpeaker::Volume::Loudest"
    },
    {
-     "enum_field_value" : 4,
+     "enum_field_value" : 0,
     "name" : "SuperSpeaker::Volume::Lower"
    }
   ],
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  enum_fields {
--- 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
@@ -272,7 +272,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -98,7 +98,7 @@
     "name" : "SuperSpeaker::Volume::Loudest"
    },
    {
-     "enum_field_value" : 4,
+     "enum_field_value" : 0,
     "name" : "SuperSpeaker::Volume::Lower"
    }
   ],
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  enum_fields {
--- 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
@@ -272,7 +272,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -98,7 +98,7 @@
     "name" : "SuperSpeaker::Volume::Loudest"
    },
    {
-     "enum_field_value" : 4,
+     "enum_field_value" : 0,
     "name" : "SuperSpeaker::Volume::Lower"
    }
   ],
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  enum_fields {
--- 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
@@ -272,7 +272,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -98,7 +98,7 @@
     "name" : "SuperSpeaker::Volume::Loudest"
    },
    {
-     "enum_field_value" : 4,
+     "enum_field_value" : 0,
     "name" : "SuperSpeaker::Volume::Lower"
    }
   ],
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  enum_fields {
--- 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
@@ -272,7 +272,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -98,7 +98,7 @@
     "name" : "SuperSpeaker::Volume::Loudest"
    },
    {
-     "enum_field_value" : 4,
+     "enum_field_value" : 0,
     "name" : "SuperSpeaker::Volume::Lower"
    }
   ],
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  enum_fields {
--- 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
@@ -272,7 +272,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -98,7 +98,7 @@
     "name" : "SuperSpeaker::Volume::Loudest"
    },
    {
-     "enum_field_value" : 4,
+     "enum_field_value" : 0,
     "name" : "SuperSpeaker::Volume::Lower"
    }
   ],
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- 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
@@ -212,7 +212,7 @@ enum_types {
    name: "SuperSpeaker::Volume::Loudest"
  }
  enum_fields {
-    enum_field_value: 4
+    enum_field_value: 0
    name: "SuperSpeaker::Volume::Lower"
  }
  access: private_access
--- a/Show More
+++ b/Show More