ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mkbootimg: use int for os_version and os_patch_level"

Browse source 
am: adbe06d

* commit 'adbe06db4870e9829ddc8c702f8789df6f2401b1':
  mkbootimg: use int for os_version and os_patch_level

Change-Id: I23125c4f1842491effa903b2e30aee07664a6b98
This commit is contained in:
Sami Tolvanen 2016-03-30 01:36:59 +00:00 • committed by android-build-merger
commit e4052d2ca5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mkbootimg/mkbootimg
View file

@ -102,12 +102,12 @@ def parse_int(x):
def parse_os_version(x):
match = re.search(r'^(\d{1,3})(?:\.(\d{1,3})(?:\.(\d{1,3}))?)?', x)
if match:
a = parse_int(match.group(1))
a = int(match.group(1))
b = c = 0
if match.lastindex >= 2:
b = parse_int(match.group(2))
b = int(match.group(2))
if match.lastindex == 3:
c = parse_int(match.group(3))
c = int(match.group(3))
# 7 bits allocated for each field
assert a < 128
assert b < 128
@ -118,8 +118,8 @@ def parse_os_version(x):
def parse_os_patch_level(x):
match = re.search(r'^(\d{4})-(\d{2})-(\d{2})', x)
if match:
y = parse_int(match.group(1)) - 2000
m = parse_int(match.group(2))
y = int(match.group(1)) - 2000
m = int(match.group(2))
# 7 bits allocated for the year, 4 bits for the month
assert y >= 0 and y < 128
assert m > 0 and m <= 12