commit a5dd6bef562dd5bafdf84eb0f0a00703218f97b6
author Shih-wei Liao <sliao@google.com> Sat Mar 24 13:18:46 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sat Mar 24 13:42:00 2012 -0700
tree 870292c36e4483d1fbae80f176036dcbae39d3a3
parent edec37249f46e11cbfe25eb10a3ab64ee4112b79

Fix dalvik-dev build. Handle the case of no input dex.

Change-Id: I9c242a1163092774d8ef23f4d784b474bba54751

src/oat_writer.cc

diff --git a/src/oat_writer.cc b/src/oat_writer.cc
index df809d5..c69f619 100644
--- a/src/oat_writer.cc
+++ b/src/oat_writer.cc
@@ -115,12 +115,17 @@
 }
 
 size_t OatWriter::InitOatElfImages(size_t offset) {
-  // Offset to ELF image table should be rounded up to 4-byte aligned, so that
-  // we can read the uint32_t directly.
-  offset = RoundUp(offset, 4);
-  oat_header_->SetElfImageTableOffset(offset);
+  size_t n = elf_images_.size();
+  if (n != 0) {
+    // Offset to ELF image table should be rounded up to 4-byte aligned, so that
+    // we can read the uint32_t directly.
+    offset = RoundUp(offset, 4);
+    oat_header_->SetElfImageTableOffset(offset);
+  } else {
+    oat_header_->SetElfImageTableOffset(0);
+  }
 
-  for (size_t i = 0, n = elf_images_.size(); i < n; ++i) {
+  for (size_t i = 0; i < n; ++i) {
     OatElfImage* oat_elf_image = new OatElfImage(elf_images_[i]);
     oat_elf_images_.push_back(oat_elf_image);
     offset += oat_elf_image->SizeOf();