resolved conflicts for merge of 31b88da8 to lmp-mr1-dev-plus-aosp

Change-Id: I3081cba9e1372adc085380cda01d4825543a6727
2014-10-02 08:53:42 -07:00
parent d081e8b539 31b88da843
commit 8fd546313c
3 changed files with 38 additions and 0 deletions
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -214,8 +214,12 @@ struct soinfo {

  void set_st_dev(dev_t st_dev);
  void set_st_ino(ino_t st_ino);
+  void set_has_ifuncs(bool ifunc);
  ino_t get_st_ino();
  dev_t get_st_dev();
+  bool get_has_ifuncs();
+
+

  int get_rtld_flags();