p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "fs_config: Fix oem range parsing" 

am: ce6c8e629f

Change-Id: I74d198a2638b875233859a1c7ff723b04b47a353
This commit is contained in:
Elliott Hughes 2017-01-04 00:41:40 +00:00 committed by android-build-merger
parent 74b665fef1 ce6c8e629f
commit c16a64b832
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/fs_config/fs_config_generator.py
View File

@ -252,7 +252,7 @@ class AIDHeaderParser(object):
_AID_DEFINE = re.compile(r'\s*#define\s+%s.*' % AID.PREFIX)
_OEM_START_KW = 'START'
_OEM_END_KW = 'END'
_OEM_RANGE = re.compile('%s_OEM_RESERVED_[0-9]*_{0,1}(%s|%s)' %
_OEM_RANGE = re.compile('%sOEM_RESERVED_[0-9]*_{0,1}(%s|%s)' %
(AID.PREFIX, _OEM_START_KW, _OEM_END_KW))
# AID lines cannot end with _START or _END, ie AID_FOO is OK
# but AID_FOO_START is skiped. Note that AID_FOOSTART is NOT skipped.