commit 9b3944ed8cc483da6db750faa8c9d9ad2b3ba919
author Doug Zongker <dougz@android.com> Thu Sep 16 13:08:25 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 16 13:08:25 2010 -0700
tree d005110ca9ac935f6ef66427e0b9f08955727f17
parent f127eb709b9a9fb9b04cda0cb7ef96ca65768ec8
parent 4d197be33970a163e8e38ba1b685718784498e43

am 4d197be3: am ec5ffbab: allow partition sizes in hex (when prefixed with 0x)

Merge commit '4d197be33970a163e8e38ba1b685718784498e43'

* commit '4d197be33970a163e8e38ba1b685718784498e43':
  allow partition sizes in hex (when prefixed with 0x)

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 8b163c0..44291d0 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -94,12 +94,12 @@
       pieces = line.split()
       if len(pieces) != 2: continue
       image = pieces[0]
-      size = int(pieces[1])
+      size = int(pieces[1], 0)
       OPTIONS.max_image_size[image + ".img"] = size
   except IOError, e:
     if e.errno == errno.ENOENT:
       def copy(x, y):
-        if x+y in info: OPTIONS.max_image_size[x+".img"] = int(info[x+y])
+        if x+y in info: OPTIONS.max_image_size[x+".img"] = int(info[x+y], 0)
       copy("blocksize", "")
       copy("boot", "_size")
       copy("recovery", "_size")