resolved conflicts for merge of 3bbd218e to lmp-mr1-dev-plus-aosp
Change-Id: Ie7f85be196a44ab59554384274f2022239f91b0e
This commit is contained in:
commit
88eb2a9cf5
@ -1737,11 +1737,9 @@ void soinfo::set_st_ino(ino_t ino) {
|
||||
}
|
||||
|
||||
void soinfo::set_has_ifuncs(bool ifuncs) {
|
||||
if ((this->flags & FLAG_NEW_SOINFO) == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (has_min_version(1)) {
|
||||
has_ifuncs = ifuncs;
|
||||
}
|
||||
}
|
||||
|
||||
dev_t soinfo::get_st_dev() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user