Merge "resolved conflicts for merge of bd321c11
to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
This commit is contained in:

committed by
Android (Google) Code Review

commit
5848154714
@@ -1673,6 +1673,8 @@ void soinfo::CallConstructors() {
|
|||||||
// DT_INIT should be called before DT_INIT_ARRAY if both are present.
|
// DT_INIT should be called before DT_INIT_ARRAY if both are present.
|
||||||
CallFunction("DT_INIT", init_func);
|
CallFunction("DT_INIT", init_func);
|
||||||
CallArray("DT_INIT_ARRAY", init_array, init_array_count, false);
|
CallArray("DT_INIT_ARRAY", init_array, init_array_count, false);
|
||||||
|
|
||||||
|
resolve_ifunc_symbols();
|
||||||
}
|
}
|
||||||
|
|
||||||
void soinfo::CallDestructors() {
|
void soinfo::CallDestructors() {
|
||||||
|
Reference in New Issue
Block a user