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

Change-Id: I31d81e91d796fa27f9c88a7edc96c97320ade72c
2014-10-02 11:52:06 -07:00
parent daf15a6ca7 c0133a73b6
commit e3105fee22
8 changed files with 99 additions and 492 deletions
--- a/linker/linker_phdr.cpp
+++ b/linker/linker_phdr.cpp
@@ -718,6 +718,19 @@ void phdr_table_get_dynamic_section(const ElfW(Phdr)* phdr_table, size_t phdr_co
      }
      return;
    }
+
+    *dynamic = reinterpret_cast<ElfW(Dyn)*>(load_bias + phdr->p_vaddr);
+    if (dynamic_count) {
+      *dynamic_count = (unsigned)(phdr->p_memsz / 8);
+    }
+    if (dynamic_flags) {
+      *dynamic_flags = phdr->p_flags;
+    }
+    return;
+  }
+  *dynamic = nullptr;
+  if (dynamic_count) {
+    *dynamic_count = 0;
  }
 }