LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Make message format change backwards compatible." am: 513bf3c355

Browse Source 
am: 89d0e6c39b

Change-Id: I4eaa574834b9f1dd40ba9f62bd1f7966ac720dbd
This commit is contained in:
Jayant Chowdhary
2017-06-28 06:38:06 +00:00
committed by android-build-merger
parent 13d0f1169b 89d0e6c39b
commit edc5538cc9
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vndk/tools/header-checker/header-abi-diff/src/abi_diff_wrappers.cpp
View File

@@ -144,7 +144,8 @@ bool Diff<VTableComponent>(const VTableComponent &old_element,
bool kind_comparison = old_element.kind() != new_element.kind();
bool mangled_name_comparison = old_element.mangled_component_name() !=
new_element.mangled_component_name();
bool value_comparison = old_element.value() != new_element.value();
bool value_comparison =
old_element.component_value() != new_element.component_value();
return kind_comparison || mangled_name_comparison || value_comparison;
}

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

@@ -474,7 +474,7 @@ bool RecordDeclWrapper::SetupRecordVTableComponent(
return false;
}
added_vtable_component->set_kind(kind);
added_vtable_component->set_value(value);
added_vtable_component->set_component_value(value);
added_vtable_component->set_mangled_component_name(mangled_component_name);
return true;
}

5
vndk/tools/header-checker/proto/abi_dump.proto
View File

@@ -79,7 +79,10 @@ message VTableComponent {
}
optional Kind kind = 1;
optional string mangled_component_name = 2 [default = ""];
optional int64 value = 3 [default = 0];
// Maintain backwards compatibility. Builds don't break while updating
// reference dumps. TODO: b/63081517
optional uint64 value = 3 [default = 0];
optional int64 component_value = 4 [default = 0];
}
message VTableLayout {

12
vndk/tools/header-checker/tests/expected/example1.h
View File

@@ -73,17 +73,17 @@ records {
vtable_components {
kind: OffsetToTop
mangled_component_name: ""
value: 0
component_value: 0
}
vtable_components {
kind: RTTI
mangled_component_name: "test2::HelloAgain"
value: 0
component_value: 0
}
vtable_components {
kind: FunctionPointer
mangled_component_name: "_ZN5test210HelloAgain5againEv"
value: 0
component_value: 0
}
}
}
@@ -324,17 +324,17 @@ records {
vtable_components {
kind: OffsetToTop
mangled_component_name: ""
value: 0
component_value: 0
}
vtable_components {
kind: RTTI
mangled_component_name: "CPPHello"
value: 0
component_value: 0
}
vtable_components {
kind: FunctionPointer
mangled_component_name: "_ZN8CPPHello5againEv"
value: 0
component_value: 0
}
}
}

6
vndk/tools/header-checker/tests/expected/example2.h
View File

@@ -73,17 +73,17 @@ records {
vtable_components {
kind: OffsetToTop
mangled_component_name: ""
value: 0
component_value: 0
}
vtable_components {
kind: RTTI
mangled_component_name: "test2::HelloAgain"
value: 0
component_value: 0
}
vtable_components {
kind: FunctionPointer
mangled_component_name: "_ZN5test210HelloAgain5againEv"
value: 0
component_value: 0
}
}
}